Fix un-needed environment attribute in deployer

sukrit007 · sukrit007 · commit 73567fbb52f6 · 2016-01-20T17:46:17.000-07:00
diff --git a/conf/appconfig.py b/conf/appconfig.py
@@ -80,8 +80,7 @@
             'args': {}
         }
     },
-    'deployment': {},
-    'environment': {}
+    'deployment': {}
 }
 
 DEFAULT_HIPCHAT_TOKEN = os.getenv('HIPCHAT_TOKEN', '')
diff --git a/tests/unit/orchestrator/services/test_config.py b/tests/unit/orchestrator/services/test_config.py
@@ -384,8 +384,7 @@ def test_evaluate_config_with_deployers():
                         'args': {}
                     }
                 },
-                'deployment': {},
-                'environment': {}
+                'deployment': {}
             },
             'deployer2': {
                 'url': 'deployer2-url',
@@ -397,8 +396,8 @@ def test_evaluate_config_with_deployers():
                     }
                 },
                 'deployer-name': 'deployer2',
-                'deployment': {},
-                'environment': {}
+                'deployment': {}
+
             }
         }
     })
@@ -591,8 +590,7 @@ def test_load_config(m_validate_schema, m_get_provider):
                 'proxy': {},
                 'deployment': {},
                 'url': 'deployer2-url1',
-                'enabled': True,
-                'environment': {}
+                'enabled': True
             }
         },
         'environment': {

Original file line number	Diff line number	Diff line change
`@@ -80,8 +80,7 @@`
`80`	`80`	`'args': {}`
`81`	`81`	`}`
`82`	`82`	`},`
`83`		`- 'deployment': {},`
`84`		`- 'environment': {}`
	`83`	`+ 'deployment': {}`
`85`	`84`	`}`
`86`	`85`
`87`	`86`	`DEFAULT_HIPCHAT_TOKEN = os.getenv('HIPCHAT_TOKEN', '')`
Original file line number	Diff line number	Diff line change
`@@ -384,8 +384,7 @@ def test_evaluate_config_with_deployers():`
`384`	`384`	`'args': {}`
`385`	`385`	`}`
`386`	`386`	`},`
`387`		`- 'deployment': {},`
`388`		`- 'environment': {}`
	`387`	`+ 'deployment': {}`
`389`	`388`	`},`
`390`	`389`	`'deployer2': {`
`391`	`390`	`'url': 'deployer2-url',`
`@@ -397,8 +396,8 @@ def test_evaluate_config_with_deployers():`
`397`	`396`	`}`
`398`	`397`	`},`
`399`	`398`	`'deployer-name': 'deployer2',`
`400`		`- 'deployment': {},`
`401`		`- 'environment': {}`
	`399`	`+ 'deployment': {}`
	`400`	`+`
`402`	`401`	`}`
`403`	`402`	`}`
`404`	`403`	`})`
`@@ -591,8 +590,7 @@ def test_load_config(m_validate_schema, m_get_provider):`
`591`	`590`	`'proxy': {},`
`592`	`591`	`'deployment': {},`
`593`	`592`	`'url': 'deployer2-url1',`
`594`		`- 'enabled': True,`
`595`		`- 'environment': {}`
	`593`	`+ 'enabled': True`
`596`	`594`	`}`
`597`	`595`	`},`
`598`	`596`	`'environment': {`