don't set the current user to my_user in frontend_test_utils. let it default to the new autotest_system user.
Signed-off-by: Steve Howard <[email protected]>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@4156 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/frontend/afe/frontend_test_utils.py b/frontend/afe/frontend_test_utils.py
index 69b76b1..c34454e 100644
--- a/frontend/afe/frontend_test_utils.py
+++ b/frontend/afe/frontend_test_utils.py
@@ -9,7 +9,7 @@
def _fill_in_test_data(self):
"""Populate the test database with some hosts and labels."""
acl_group = models.AclGroup.objects.create(name='my_acl')
- acl_group.users.add(self.user)
+ acl_group.users.add(models.User.current_user())
self.hosts = [models.Host.objects.create(hostname=hostname)
for hostname in
@@ -58,15 +58,9 @@
self.hosts[hostnum].labels.add(self.label7)
- def _setup_dummy_user(self):
- self.user = models.User.objects.create(login='my_user', access_level=0)
- thread_local.set_user(self.user)
-
-
def _frontend_common_setup(self, fill_data=True):
self.god = mock.mock_god()
setup_test_environment.set_up()
- self._setup_dummy_user()
if fill_data:
self._fill_in_test_data()
@@ -106,7 +100,7 @@
if active:
status = models.HostQueueEntry.Status.RUNNING
job = models.Job.objects.create(
- name='test', owner='my_user', priority=priority,
+ name='test', owner='autotest_system', priority=priority,
synch_count=synch_count, created_on=created_on,
reboot_before=models.RebootBefore.NEVER)
for host_id in hosts:
diff --git a/frontend/afe/models_test.py b/frontend/afe/models_test.py
index 94175f5..8bd8eb7 100755
--- a/frontend/afe/models_test.py
+++ b/frontend/afe/models_test.py
@@ -120,7 +120,7 @@
task = models.SpecialTask.objects.create(
host=self.hosts[0], task=models.SpecialTask.Task.VERIFY,
queue_entry=job.hostqueueentry_set.all()[0])
- self.assertEquals(task.requested_by.login, 'my_user')
+ self.assertEquals(task.requested_by.login, 'autotest_system')
class HostQueueEntryUnittest(unittest.TestCase,
@@ -138,7 +138,7 @@
entry.execution_subdir = 'subdir'
entry.save()
- self.assertEquals(entry.execution_path(), '1-my_user/subdir')
+ self.assertEquals(entry.execution_path(), '1-autotest_system/subdir')
if __name__ == '__main__':
diff --git a/frontend/afe/rpc_interface_unittest.py b/frontend/afe/rpc_interface_unittest.py
index 7a8b7e2..9ba13cb 100755
--- a/frontend/afe/rpc_interface_unittest.py
+++ b/frontend/afe/rpc_interface_unittest.py
@@ -258,9 +258,9 @@
paths = [entry['execution_path'] for entry in entries_and_tasks]
self.assertEquals(paths, ['hosts/host1/3-verify',
- '2-my_user/host1',
+ '2-autotest_system/host1',
'hosts/host1/2-verify',
- '1-my_user/host1',
+ '1-autotest_system/host1',
'hosts/host1/1-verify'])
verify2 = entries_and_tasks[2]
@@ -309,7 +309,7 @@
task = tasks[0]
self.assertEquals(task['task'], models.SpecialTask.Task.VERIFY)
- self.assertEquals(task['requested_by'], 'my_user')
+ self.assertEquals(task['requested_by'], 'autotest_system')
