Changeset 87

Timestamp:

07/11/06 16:02:40 (6 years ago)

Author:

grig

Message:

Added back Will's changes. The only functional test that was failing was testing a single file archive. Accounted for that in the pylint index.

Files:

• branches/mk/cheesecake/cheesecake_index.py (modified) (2 diffs)
• branches/mk/tests/functional/test_cleaning_up.py (modified) (3 diffs)

branches/mk/cheesecake/cheesecake_index.py

@@ -844 +844 @@
-        cnt = 0
-
+        # wbg: switching cwd so that pylint works correctly regarding
+        # running it on individual modules
+        original_cwd = os.getcwd()
+        # change dir to top of the package tree
+        # package_dir may be a file if the archive contains a single file...
+        # if this is the case, change dir to the parent dir of that file
+        if os.path.isfile(package_dir):
+            package_dir = os.path.dirname(package_dir)
+        os.chdir(package_dir)
+
-        for pyfile in get_files_of_type(files_list, 'module'):
-
+
+
+
+
-            path, filename = os.path.split(fullpath)
-            module, ext = os.path.splitext(filename)
@@ -868 +881 @@
-                pylint_value += float(score)
-                cnt += 1
+
+        # wbg: switching back to the original cwd in case that's important
+        os.chdir(original_cwd)
-
-        avg_score = 0

branches/mk/tests/functional/test_cleaning_up.py

@@ -21 +21 @@
-
-    def test_valid_no_tmp(self):
-ft
+ave
-        self._run_cheesecake('-p %s -s %s -l %s' % (NOSE_PATH, self.sandbox, self.logfile))
-
-        self._assert_success()
-
-ft
+ave
-        assert not os.path.exists(self.sandbox)
-
@@ -32 +32 @@
-        assert not os.path.exists(self.logfile)
-
-ft
+ave
-        assert glob(os.path.join(tempfile.gettempdir(), "cheesecake*")) == []
-
-ft
+ave
-        assert filter_our_files(get_tmp_files()) == self.temp_files
-
-    def test_invalid_no_tmp(self):
-ft
+ave
-        self._run_cheesecake('-p %s -s %s -l %s' % (INVALID_PACKAGE_PATH, self.sandbox, self.logfile))
-
@@ -45 +45 @@
-        self._assert_success()
-
-ft
+ave
-        assert not os.path.exists(self.sandbox)
-
-ft
+ave
-        assert glob(os.path.join(tempfile.gettempdir(), "cheesecake*")) == []
-
-ft
+ave
-        assert filter_our_files(get_tmp_files()) == self.temp_files
+
+        # Delete the log file, so that it doesn't pollute /tmp
+        self._cleanup_logfile()
+
+    def _cleanup_logfile(self):
+        os.unlink(self.logfile)