Merge lp:~cjohnston/ubuntu-ci-services-itself/fix-cli-run-tests into lp:ubuntu-ci-services-itself

[Chris Johnston]

Fix most of the issues with the cli and run-tests

[Andy Doan (doanac)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:286
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/248/
Executed test runs:

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/uci-engine-ci/248/rebuild

review: Approve (continuous-integration)

[Chris Johnston (cjohnston)]

 merge approved

review: Approve

=== modified file 'cli/tests/test_file_handler.py'
--- cli/tests/test_file_handler.py	2014-02-21 18:18:15 +0000
+++ cli/tests/test_file_handler.py	2014-02-27 19:16:45 +0000
@@ -15,20 +15,20 @@
 # You should have received a copy of the GNU General Public License along with
 # this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from os.path import join
+import os
 from ci_libs.file_handler import (ChangesProcessor, ChangesFileNotFound,
                                   ChangesParseError, ChangesValidationError,
                                   FileToUploadNotFound, UploadDirNotFound)
 from dput.changes import Changes, ChangesFileException
 from tests import CLITestCase
 
-TEST_DATA_ROOT = "tests/data"
+TEST_DATA_ROOT = os.path.join(os.path.dirname(__file__), 'data')
 
 
 class ChangesProcessorTestCase(CLITestCase):
 
     def _get_test_fullpath(self, filename):
-        return join(TEST_DATA_ROOT, filename)
+        return os.path.join(TEST_DATA_ROOT, filename)
 
     def create_test_info(self, source_name="foobar", source_version="0.1",
                          packaging_version="1"):
@@ -94,8 +94,8 @@
     def test_files_to_upload_dir_found(self):
         processor = ChangesProcessor(
             self._get_test_fullpath(self.changes_file),
-            files_to_upload_dir="tests/data")
-        self.assertEquals(processor.files_to_upload_dir, "tests/data")
+            files_to_upload_dir=TEST_DATA_ROOT)
+        self.assertEquals(processor.files_to_upload_dir, TEST_DATA_ROOT)
 
     def test_file_to_upload_not_found(self):
         processor = ChangesProcessor(