Merge lp:~doanac/utah/server-test-fixes into lp:utah

[Andy Doan]

fix some unit-test breakages we've had for a couple of months

[Max Brustkern (nuclearbob)]

Have you tested running test-vm repeatedly on the same system to verify that using the same log path doesn't generate permissions issues? I can if you haven't.

review: Needs Information

[Andy Doan (doanac)]

On 08/20/2013 12:53 PM, Max Brustkern wrote:
> Have you tested running test-vm repeatedly on the same system to
> verify that using the same log path doesn't generate permissions
> issues? I can if you haven't.

Not sure I understand. self.logpath was never actually used in
test_vm.py. It looks like dead code?

[Max Brustkern (nuclearbob)]

> On 08/20/2013 12:53 PM, Max Brustkern wrote:
> > Have you tested running test-vm repeatedly on the same system to
> > verify that using the same log path doesn't generate permissions
> > issues? I can if you haven't.
>
> Not sure I understand. self.logpath was never actually used in
> test_vm.py. It looks like dead code?

The idea was to verify that the log file for the VM was still writable after the thing occurred. That way, if we can't write to the log file, setUp will fail instead of the tests failing. Now that logpath isn't being changed by the previous test, that's probably not needed.

=== modified file 'tests/test_config.py'
--- tests/test_config.py	2013-06-24 21:04:03 +0000
+++ tests/test_config.py	2013-08-20 15:55:34 +0000
@@ -97,5 +97,5 @@
             config._process_config_file(config_filenames[1])
 
             stderr.write.assert_called_with(
-                'WARNING: {} was already set by {}'
+                'WARNING: {} was already set by {}\n'
                 .format(option_name, config_filenames[0]))

=== modified file 'tests/test_parser.py'
--- tests/test_parser.py	2013-06-24 21:13:27 +0000
+++ tests/test_parser.py	2013-08-20 15:55:34 +0000
@@ -93,19 +93,28 @@
         """Verify that logpath from command line updates log file names."""
         logpath = 'valid-logpath'
         hostname = config.hostname
+        orig_lp = config.logpath
         with patch('utah.parser.directory_argument') as directory_argument:
             directory_argument.return_value = logpath
             args = self.parse_args_wrapper(['--logpath', logpath,
                                             '<runlist_file>'])
+        # reset values so other tests after this don't get messed up
+        newlp = config.logpath
+        newlf = config.logfile
+        newdl = config.debuglog
+        newsl = config.ssh_logfile
+        config.logpath = orig_lp
+        config._set_log_files()
+
         self.assertEqual(args.logpath, logpath)
-        self.assertEqual(config.logpath, logpath)
-        self.assertEqual(config.logfile,
+        self.assertEqual(newlp, logpath)
+        self.assertEqual(newlf,
                          os.path.join(logpath,
                                       '{}.log'.format(hostname)))
-        self.assertEqual(config.debuglog,
+        self.assertEqual(newdl,
                          os.path.join(logpath,
                                       '{}-debug.log'.format(hostname)))
-        self.assertEqual(config.ssh_logfile,
+        self.assertEqual(newsl,
                          os.path.join(logpath,
                                       '{}-ssh.log'.format(hostname)))
 

=== modified file 'tests/test_run_utah_phablet.py'
--- tests/test_run_utah_phablet.py	2013-07-12 20:36:47 +0000
+++ tests/test_run_utah_phablet.py	2013-08-20 15:55:34 +0000
@@ -117,12 +117,12 @@
     def test_install_utah(self, adbshell):
         """ensure utah install logic is okay by ensure proper PPA is used."""
         _install_utah(self.device, self.args.ppa, self.args.branch)
-        self.assertIn(self.args.ppa, adbshell.call_args_list[0][0][0])
+        self.assertIn(self.args.ppa, adbshell.call_args_list[1][0][0])
 
         adbshell.reset_mock()
         args = _get_parser().parse_args(['--ppa', 'blah', '-b', 'blah'])
         _install_utah(self.device, args.ppa, args.branch)
-        self.assertIn(args.ppa, adbshell.call_args_list[0][0][0])
+        self.assertIn(args.ppa, adbshell.call_args_list[1][0][0])
         self.assertIn('bzr branch blah', adbshell.call_args_list[-1][0][0])
 
     @mock.patch('run_utah_phablet._flash')

=== modified file 'tests/test_vm.py'
--- tests/test_vm.py	2013-06-24 21:56:45 +0000
+++ tests/test_vm.py	2013-08-20 15:55:34 +0000
@@ -15,10 +15,6 @@
 
 """Test virtual machine functionality."""
 
-
-import tempfile
-import os
-
 import libvirt
 import unittest
 
@@ -35,13 +31,9 @@
     def setUp(self):
         """Create libvirt connection and verify VM is not present."""
         self.vmname = 'utah-unittest'
-        self.logpath = tempfile.mkdtemp(prefix='/tmp/{}_'.format(self.vmname))
         self.lv = libvirt.open(config.qemupath)
         with self.assertRaisesRegexp(libvirt.libvirtError, 'Domain not found'):
             self.lv.lookupByName(self.vmname)
-        with open(os.path.join(self.logpath,
-                  '{}-install.log'.format(self.vmname)), 'w'):
-            pass
 
     def cleanUp(self):
         """Remove temporary resources."""