Modified the servo_tidy_tests for both "./mach" and "make test"

- fix `cd python/tidy; make test` fail issue
servo · Apr 14, 2016 · 8c4c899 · 8c4c899
1 parent 753db5e
commit 8c4c899
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/python/tidy/Makefile b/python/tidy/Makefile
@@ -16,9 +16,7 @@ dev-env: $(VENV)/bin/python
 # for testing
 .PHONY: test
 test: dev-env
-	$(VENV)/bin/pip install --upgrade funcsigs
-	$(VENV)/bin/pip install --upgrade mock
-	$(VENV)/bin/python -m unittest discover -s tests -v
+	$(VENV)/bin/python -m unittest discover -s servo_tidy_tests -v
 
 
 .PHONY: clean

diff --git a/python/tidy/servo_tidy_tests/test_tidy.py b/python/tidy/servo_tidy_tests/test_tidy.py
@@ -7,12 +7,14 @@
 # option. This file may not be copied, modified, or distributed
 # except according to those terms.
 
+import os
 import unittest
 from servo_tidy import tidy
 
 
 def iterFile(name):
-    return iter(['python/tidy/servo_tidy_tests/' + name])
+    path = 'servo_tidy_tests/' if os.path.exists('servo_tidy_tests/') else 'python/tidy/servo_tidy_tests/'
+    return iter([os.path.join(path, name)])
 
 
 class CheckTidiness(unittest.TestCase):