Permalink
Browse files

Fixed the running of demo and put in better instructions. Handle miss…

…ing options file more gracefully
  • Loading branch information...
1 parent 4a4009f commit df695dab46f890c4c212b91244cb81a4b91b254f Mikko committed Jul 3, 2012
Showing with 13 additions and 12 deletions.
  1. +5 −1 demo/README.rst
  2. +2 −2 demo/validation-files.yaml
  3. 0 demo/validation-options.yaml
  4. +4 −7 tests/test_ghetto.py
  5. +2 −2 vvv/main.py
View
@@ -1,4 +1,8 @@
-Uncomment validation-files.yaml options to make demo validation possible.
+- Uncomment validation-files.yaml options to make demo validation possible.
+
+- Run demo::
+
+ vvv demo/
(Otherwise VVV proejct global settings are used and they are configured to
allow committing bad files under demo/ folder.)
@@ -1,3 +1,3 @@
-all: |
- !*
+ #all: |
+ # *
No changes.
View
@@ -4,15 +4,11 @@
"""
-"""
-
- test addjsglobals.py for various JS file styles
-
-"""
import unittest
-from vvv.scripts import addjsglobals
+# R0201: 21,4:TestGhetto.test_import: Method could be a function
+# pylint: disable=R0201
class TestGhetto(unittest.TestCase):
@@ -24,4 +20,5 @@ def test_import(self):
"""
See that script imports both Python 2.7 and Python 3.x
"""
- import ghettoci
+ import ghettoci
+ ghettoci.POkE = True
View
@@ -216,7 +216,7 @@ def read_config(self):
logger.debug("Using options config file: %s" % self.options)
- if os.path.exists(self.options):
+ if self.options and os.path.exists(self.options):
self.options_data = Config(self.options)
self.options_data.load()
else:
@@ -225,7 +225,7 @@ def read_config(self):
logger.debug("Using files config file: %s" % self.files)
- if os.path.exists(self.files):
+ if self.files and os.path.exists(self.files):
self.files_data = Config(self.files)
self.files_data.load()
else:

0 comments on commit df695da

Please sign in to comment.