diff --git a/awx/main/management/commands/run_task_system.py b/awx/main/management/commands/run_task_system.py index dd97f4e144..8e284412a1 100644 --- a/awx/main/management/commands/run_task_system.py +++ b/awx/main/management/commands/run_task_system.py @@ -72,7 +72,7 @@ class SimpleDAG(object): for from_node, to_node in self.edges: doc += "%s -> %s;\n" % (short_string_obj(self.nodes[from_node]['node_object']), short_string_obj(self.nodes[to_node]['node_object'])) - doc += "}" + doc += "}\n" gv_file = open('/tmp/graph.gv', 'w') gv_file.write(doc) gv_file.close() diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index a622755cff..606330b939 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -31,6 +31,7 @@ from django.utils.timezone import now, make_aware, get_default_timezone # AWX from awx.main.fields import AutoOneToOneField from awx.main.models.base import * +from awx.main.utils import encrypt_field __all__ = ['Inventory', 'Host', 'Group', 'InventorySource', 'InventoryUpdate'] diff --git a/awx/main/models/projects.py b/awx/main/models/projects.py index ee43649a5d..94ab4d3cb7 100644 --- a/awx/main/models/projects.py +++ b/awx/main/models/projects.py @@ -33,6 +33,7 @@ from django.utils.timezone import now, make_aware, get_default_timezone from awx.lib.compat import slugify from awx.main.models.base import * from awx.main.utils import update_scm_url +from awx.main.utils import encrypt_field __all__ = ['Project', 'ProjectUpdate'] diff --git a/awx/main/tests/commands.py b/awx/main/tests/commands.py index 1acb45bf6c..34a081a0b0 100644 --- a/awx/main/tests/commands.py +++ b/awx/main/tests/commands.py @@ -395,7 +395,7 @@ class CleanupJobsTest(BaseCommandMixin, BaseLiveServerTest): result, stdout, stderr = self.run_command('cleanup_jobs') self.assertEqual(result, None) jobs_after = Job.objects.all().count() - self.assertEqual(jobs_before, jobs_after) + self.assertEqual(jobs_before, jobs_after) # Create and run job. self.create_test_project(TEST_PLAYBOOK) job_template = self.create_test_job_template()