Merge lp:~doanac/utah/vcs-dev-relative into lp:utah

[Andy Doan]

Allows the use of relative paths when using a "dev" as the fetch-method of a runlist

[Max Brustkern (nuclearbob)]

This looks good. If you felt like it, it would be awesome if you could also make the test_vcs_bzr and test_vcs_git scripts not fail to initialize probes as well, since those two are still broken. We can come back to that later, though.

review: Approve

[Andy Doan (doanac)]

On 06/25/2013 09:41 PM, Max Brustkern wrote:

> If you felt like it, it would be awesome if you could also make the test_vcs_bzr and test_vcs_git scripts not fail to initialize probes as well, since those two are still broken.

I think that should be fixed in trunk already.

=== modified file 'utah/client/runner.py'
--- utah/client/runner.py	2013-06-19 16:46:28 +0000
+++ utah/client/runner.py	2013-06-25 03:17:23 +0000
@@ -410,13 +410,14 @@
 
         return tests
 
-    def _fetch_suite(self, suite):
+    def _fetch_suite(self, runlist, suite):
         name = suite['name']
         syslog.syslog('Fetching testsuite: {}'.format(name))
         vcs_handler = create_vcs_handler(
             suite['fetch_method'],
             suite['fetch_location'],
             name,
+            runlist,
         )
         res = timeout(60, retry, vcs_handler.get, name)
         self.result.add_result(res)
@@ -464,11 +465,11 @@
             raise exceptions.UTAHClientError(
                 'Error removing the testsuite {}: {}'.format(name, e))
 
-    def _add_suite(self, suite):
+    def _add_suite(self, runlist, suite):
         name = suite['name']
 
         if name not in self.fetched_suites:
-            if self._fetch_suite(suite):
+            if self._fetch_suite(runlist, suite):
                 self.fetched_suites.append(name)
                 auto = os.path.join(name, name, 'tslist.auto')
                 if os.path.exists(auto):
@@ -527,7 +528,7 @@
                 self._clean_suite(name)
 
             mkdir(name)
-            self._add_suite(suite)
+            self._add_suite(runlist, suite)
 
     def get_next_suite(self):
         """Return the next suite to be run.

=== modified file 'utah/client/tests/test_vcs_dev.py'
--- utah/client/tests/test_vcs_dev.py	2013-04-05 19:32:58 +0000
+++ utah/client/tests/test_vcs_dev.py	2013-06-25 03:17:23 +0000
@@ -18,73 +18,68 @@
 
 import os
 import shutil
+import tempfile
 import unittest
 
-from utah.client.common import run_cmd
 from utah.client.vcs import DevHandler
 
-
-DEV_TEST_REPO = "/tmp/utahdevtest"
-
-
-def setUp():
-    """Create a local directory for testing."""
-    # should fail if the repo already exists.
-    os.mkdir(DEV_TEST_REPO)
-
-    run_cmd("touch test.py", cwd=DEV_TEST_REPO)
-
-
-def tearDown():
-    """Remove the test repo."""
-    # We should only ever get here if the repo was created in setUp().
-    shutil.rmtree(DEV_TEST_REPO)
+from utah.client.tests.common import (  # NOQA
+    setUp,     # Used by nosetests
+    tearDown,  # Used by nosetests
+)
 
 
 class TestDevHandler(unittest.TestCase):
 
     """Test the dev pseudo-VCS handler."""
 
+    def setUp(self):
+        """Create a local directory for testing."""
+        self.repo = tempfile.mkdtemp()
+        with open(os.path.join(self.repo, 'test.py'), 'w') as f:
+            f.write('')
+        self.dest = tempfile.mkdtemp()
+
+    def tearDown(self):
+        """Remove the test repo."""
+        shutil.rmtree(self.repo)
+        shutil.rmtree(self.dest)
+
     def test_init(self):
         """Test the initial setup."""
-        repo = DEV_TEST_REPO
-        dev = DevHandler(repo=repo)
+        dev = DevHandler(repo=self.repo)
 
         self.assertIsNotNone(dev)
-        self.assertEqual(dev.repo, repo)
-        self.assertEqual(dev.get_command, "cp -r {} .".format(repo))
+        self.assertEqual(dev.repo, self.repo)
+        self.assertEqual(dev.get_command, "cp -r {} .".format(self.repo))
         self.assertEqual(dev.rev_command, "echo 'DEVELOPMENT'")
 
-    def test_dev_get(self):
+    def test_dev_get_absolute(self):
         """Test copying files."""
-        repo = DEV_TEST_REPO
-        dest = "utah-dev"
-        dev = DevHandler(repo=repo, destination=dest)
-        directory = "/tmp"
-        path = os.path.join(directory, dest)
-
-        self.assertFalse(os.path.exists(path), path)
-
-        result = dev.get(directory=directory)
-        self.assertEqual(result['returncode'], 0)
-
-        self.assertTrue(os.path.exists(path), path)
-        shutil.rmtree(path)
+        dev = DevHandler(repo=self.repo, destination=self.dest)
+        self.assertEqual(0, len(os.listdir(self.dest)))
+        result = dev.get(directory=self.dest)
+        self.assertEqual(result['returncode'], 0)
+        bname = os.path.basename(self.repo)
+        self.assertListEqual([bname], os.listdir(self.dest))
+        d = os.path.join(self.dest, bname)
+        self.assertListEqual(['test.py'], os.listdir(d))
+
+    def test_dev_get_relative(self):
+        """Test we can copy when passed a relative path."""
+        runlist = os.path.join(self.repo, 'master.run')
+        with open(runlist, 'w') as f:
+            f.write('')
+
+        dev = DevHandler(repo='./', destination=self.dest, runlist=runlist)
+        result = dev.get(directory=self.dest)
+        self.assertEqual(result['returncode'], 0)
+        self.assertListEqual(['test.py', 'master.run'], os.listdir(self.dest))
 
     def test_dev_revision(self):
         """Test fake revision gathering support."""
-        repo = DEV_TEST_REPO
-        dest = "utah-dev"
-        dev = DevHandler(repo=repo, destination=dest)
-        directory = "/tmp"
-        path = os.path.join(directory, dest)
-
-        self.assertFalse(os.path.exists(path))
-        result = dev.get(directory=directory)
+        dev = DevHandler(repo=self.repo, destination=self.dest)
+        result = dev.get(directory=self.dest)
         self.assertEqual(result['returncode'], 0)
-        self.assertTrue(os.path.exists(path))
-
-        result = dev.revision(directory=path)
-
-        shutil.rmtree(path)
+        result = dev.revision(directory=self.dest)
         self.assertEqual(result['returncode'], 0)

=== modified file 'utah/client/vcs.py'
--- utah/client/vcs.py	2013-06-11 17:12:07 +0000
+++ utah/client/vcs.py	2013-06-25 03:17:23 +0000
@@ -15,6 +15,9 @@
 
 """UTAH client VCS support."""
 
+import logging
+import os
+
 from utah.client.common import (
     CMD_TS_FETCH,
     run_cmd,
@@ -37,9 +40,10 @@
 
     """
 
-    def __init__(self, repo, destination=''):
+    def __init__(self, repo, destination='', runlist=None):
         self.repo = repo
         self.destination = destination
+        self.runlist = runlist
 
     def get(self, directory=REPO_DEFAULT_DIR):
         """Execute VCS get command.
@@ -145,18 +149,23 @@
 
     """
 
-    def __init__(self, repo, destination=".", **kwargs):
-        super(DevHandler, self).__init__(repo, destination, **kwargs)
+    def __init__(self, repo, destination=".", runlist=None):
+        super(DevHandler, self).__init__(repo, destination, runlist)
+
+        if self.repo[0] != '/':
+            logging.debug('using relative path for dev handler')
+            path = os.path.abspath(runlist)
+            path = os.path.dirname(path)
+            self.repo = os.path.join(path, self.repo)
 
         self.get_command = "cp -r {} {}".format(
             self.repo,
             self.destination,
         )
-
         self.rev_command = "echo 'DEVELOPMENT'"
 
 
-def create_vcs_handler(method, location, destination):
+def create_vcs_handler(method, location, destination, runlist):
     """Find an instantiate the proper VCS handler object.
 
     :return: VCSHandler object
@@ -166,6 +175,7 @@
     kwargs = {
         'repo': location,
         'destination': destination,
+        'runlist': runlist,
     }
 
     handlers = {