Merge pull request #380 from mesosphere/organize-test-files

organize test data files

cli/tests/data/marathon/sleep2.json

@@ -1,11 +0,0 @@
-{
-    "id": "test-app2",
-    "cmd": "sleep 1000",
-    "cpus": 0.1,
-    "mem": 16,
-    "instances": 1,
-    "labels": {
-        "PACKAGE_ID": "test-app",
-        "PACKAGE_VERSION": "1.2.3"
-    }
-}

cli/tests/integrations/test_config.py

@@ -28,7 +28,7 @@ def missing_env():
     r.update({
         constants.PATH_ENV: os.environ[constants.PATH_ENV],
         constants.DCOS_CONFIG_ENV:
-            os.path.join("tests", "data", "missing_params_dcos.toml")
+            os.path.join("tests", "data", "config", "missing_params_dcos.toml")
     })
     return r
 

cli/tests/integrations/test_marathon.py

@@ -48,7 +48,8 @@ def missing_env():
     env.update({
         constants.PATH_ENV: os.environ[constants.PATH_ENV],
         constants.DCOS_CONFIG_ENV:
-            os.path.join("tests", "data", "missing_marathon_params.toml")
+            os.path.join("tests", "data", "marathon",
+                         "missing_marathon_params.toml")
     })
     return env