From 12f07e454fc0cc654323c4083ecbc84eeac01500 Mon Sep 17 00:00:00 2001
From: Chris Church <chris@ninemoreminutes.com>
Date: Thu, 4 Dec 2014 15:42:18 -0500
Subject: [PATCH] Reenable test for key=value extra vars, remove some unused
 imports.

---
 awx/main/models/inventory.py    |  3 ---
 awx/main/models/jobs.py         | 16 +---------------
 awx/main/models/projects.py     |  3 ---
 awx/main/models/unified_jobs.py |  3 ---
 awx/main/tests/tasks.py         | 16 ++++++++--------
 5 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py
index 2fb8895947..30191fc401 100644
--- a/awx/main/models/inventory.py
+++ b/awx/main/models/inventory.py
@@ -14,9 +14,6 @@ import uuid
 import copy
 import random
 
-# PyYAML
-import yaml
-
 # Django
 from django.conf import settings
 from django.db import models, connection
diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py
index df5bebabcd..e7406d28fa 100644
--- a/awx/main/models/jobs.py
+++ b/awx/main/models/jobs.py
@@ -12,9 +12,6 @@ import re
 import shlex
 import uuid
 
-# PyYAML
-import yaml
-
 # Django
 from django.conf import settings
 from django.db import models
@@ -456,18 +453,7 @@ class Job(UnifiedJob, JobOptions):
                 extra_vars = json.loads(extra_data)
             except Exception, e:
                 logger.warn("Exception deserializing extra vars: " + str(e))
-        if self.extra_vars is None or self.extra_vars == "":
-            evars = {}
-        elif type(self.extra_vars) == dict:
-            evars = self.extra_vars
-        else:
-            try:
-                evars = json.loads(self.extra_vars)
-            except ValueError:
-                try:
-                    evars = yaml.safe_load(self.extra_vars)
-                except yaml.YAMLError:
-                    evars = {}
+        evars = self.extra_vars_dict
         evars.update(extra_vars)
         self.update_fields(extra_vars=json.dumps(evars))
 
diff --git a/awx/main/models/projects.py b/awx/main/models/projects.py
index 28c6ec162d..351f2b899b 100644
--- a/awx/main/models/projects.py
+++ b/awx/main/models/projects.py
@@ -13,9 +13,6 @@ import shlex
 import urlparse
 import uuid
 
-# PyYAML
-import yaml
-
 # Django
 from django.conf import settings
 from django.db import models
diff --git a/awx/main/models/unified_jobs.py b/awx/main/models/unified_jobs.py
index e9dd64036d..e2911fa69e 100644
--- a/awx/main/models/unified_jobs.py
+++ b/awx/main/models/unified_jobs.py
@@ -11,9 +11,6 @@ import os
 import os.path
 from StringIO import StringIO
 
-# PyYAML
-import yaml
-
 # Django
 from django.conf import settings
 from django.db import models
diff --git a/awx/main/tests/tasks.py b/awx/main/tests/tasks.py
index 748a4a518b..820bdc2da3 100644
--- a/awx/main/tests/tasks.py
+++ b/awx/main/tests/tasks.py
@@ -887,14 +887,14 @@ class RunJobTest(BaseCeleryTest):
         self.assertTrue('"--forks=3"' in job.job_args)
         self.assertTrue('"-vv"' in job.job_args)
         self.assertTrue('"-e"' in job.job_args)
-        # Test with extra_vars as key=value (old format).
-        # TODO: Do we still support this?
-        # job_template2 = self.create_test_job_template(extra_vars='foo=1')
-        # job2 = self.create_test_job(job_template=job_template2)
-        # self.assertEqual(job2.status, 'new')
-        # self.assertTrue(job2.signal_start())
-        # job2 = Job.objects.get(pk=job2.pk)
-        # self.check_job_result(job2, 'successful')
+        # Test with extra_vars as key=value (old format, still supported by
+        # -e option to ansible-playbook).
+        job_template2 = self.create_test_job_template(extra_vars='foo=1')
+        job2 = self.create_test_job(job_template=job_template2)
+        self.assertEqual(job2.status, 'new')
+        self.assertTrue(job2.signal_start())
+        job2 = Job.objects.get(pk=job2.pk)
+        self.check_job_result(job2, 'successful')
         # Test with extra_vars as YAML (should be converted to JSON in args).
         job_template3 = self.create_test_job_template(extra_vars='abc: 1234')
         job3 = self.create_test_job(job_template=job_template3)