updated python unittests

This commit is contained in:
geekerzp 2015-05-16 17:30:42 +08:00
parent 6826a1d7df
commit 9809ce1d18
3 changed files with 10 additions and 8 deletions

View File

@ -8,7 +8,7 @@ ifndef VIRTUAL_ENV
http://docs.python-guide.org/en/latest/dev/virtualenvs/) http://docs.python-guide.org/en/latest/dev/virtualenvs/)
endif endif
setup: virtualenv $(SETUP_OUT) setup: $(SETUP_OUT)
$(SETUP_OUT): setup.py setup.cfg $(SETUP_OUT): setup.py setup.cfg
python setup.py develop python setup.py develop
@ -19,17 +19,19 @@ $(REQUIREMENTS_OUT): $(REQUIREMENTS_FILE)
python setup.py develop python setup.py develop
clean: clean:
rm -rf $(REQUIREMENTS_OUT)
rm -rf $(SETUP_OUT)
rm -rf .tox
rm -rf .coverage
find . -name "*.py[oc]" -delete find . -name "*.py[oc]" -delete
find . -name "__pycache__" -delete find . -name "__pycache__" -delete
rm -f $(REQUIREMENTS_OUT)
rm -rf $(SETUP_OUT)
requirements: setup $(REQUIREMENTS_OUT) requirements: setup $(REQUIREMENTS_OUT)
test: requirements test: clean requirements
nosetests nosetests
test-all: requirements test-all: virtualenv clean requirements
tox tox

View File

@ -35,7 +35,7 @@
<configuration> <configuration>
<executable>make</executable> <executable>make</executable>
<arguments> <arguments>
<argument>test-all</argument> <argument>test</argument>
</arguments> </arguments>
</configuration> </configuration>
</execution> </execution>

View File

@ -94,8 +94,8 @@ class PetApiTests(unittest.TestCase):
fetched = self.pet_api.get_pet_by_id(pet_id=self.pet.id) fetched = self.pet_api.get_pet_by_id(pet_id=self.pet.id)
self.assertEqual(self.pet.id, fetched.id) self.assertEqual(self.pet.id, fetched.id)
self.assertEqual(self.pet.name, fetched.name) self.assertEqual(name, fetched.name)
self.assertEqual(self.pet.status, fetched.status) self.assertEqual(status, fetched.status)
def test_upload_file(self): def test_upload_file(self):
try: try: