From 4c0b0150fc6e5bbbf4a0a05b78c371fe31bc1dbc Mon Sep 17 00:00:00 2001
From: Israel Blancas <iblancasa@gmail.com>
Date: Sun, 20 Dec 2015 16:21:29 +0100
Subject: [PATCH] Solving problems with coverage

---
 .travis.yml       |  2 +-
 testGitHubCity.py | 27 +++++++++++++--------------
 testGitHubUser.py |  5 ++++-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a9aaa6a..422fdfd 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,6 +5,6 @@ install:
   - pip install -r requirements.txt
   - pip install coveralls
 script:
-  - nosetests  --with-coverage --cover-package=GitHubCity --cover-package=GitHubUser testGitHubCity.py testGitHubUser.py -v
+  - nosetests  --with-coverage --cover-package=GitHubCity --cover-package=GitHubUser testGitHubUser.py testGitHubCity.py -v
 after_success:
   - coveralls
diff --git a/testGitHubCity.py b/testGitHubCity.py
index 48886bf..ef1a732 100644
--- a/testGitHubCity.py
+++ b/testGitHubCity.py
@@ -138,17 +138,6 @@ def test_readAPI():
     ok_("items" in data, "Items are not correct")
 
 
-def test_getBestIntervals():
-    """Get best intervals to query"""
-
-    cityB = GitHubCity("Barcelona", idGH, secretGH)
-    cityB.calculateBestIntervals()
-
-    for i in cityB._intervals:
-        ok_(i[0]!="" and i[0]!=None, "First part of interval is not correct")
-        ok_(i[1]!="" and i[0]!=None, "First part of interval is not correct")
-
-
 def test_addUser():
     """Add new users to the list"""
     global cityA
@@ -162,14 +151,24 @@ def test_addUser():
     eq_(len(cityA._dataUsers), 1, "User was added two times to the dataUsers list")
 
 
+def test_getBestIntervals():
+    """Get best intervals to query"""
+    global cityA
+    cityA = GitHubCity("Barcelona", idGH, secretGH, debug=True)
+    cityA.calculateBestIntervals()
+
+    for i in cityA._intervals:
+        ok_(i[0]!="" and i[0]!=None, "First part of interval is not correct")
+        ok_(i[1]!="" and i[0]!=None, "First part of interval is not correct")
+
+
 
 def test_getAllUsers():
     """Get all users from a city
     """
-    global idGH, secretGH, cityA
-    cityA = GitHubCity("Granada", idGH, secretGH,debug=False)
-    cityA.calculateBestIntervals()
+    global cityA
     cityA.getCityUsers()
+    ok_(len(cityA._myusers)>=len(cityA._dataUsers),"Get all users is not ok")
 
 
 def test_excludeUsers():
diff --git a/testGitHubUser.py b/testGitHubUser.py
index f501fd8..644935c 100644
--- a/testGitHubUser.py
+++ b/testGitHubUser.py
@@ -91,12 +91,15 @@ def testNoUser():
     falseUser = GitHubUser("shurmanicop")
     assert_raises(Exception,falseUser.getData())
 
+'''
+#This test is deactivated to improve perfomance. Run only local
 def testLotOfRequest():
     """Test if request are completed when server says: 'no more' """
     global user
     i = 0
-    while i<80:
+    while i<40:
         user._contributions = 0
         user.getData()
         i+=1
     ok_(user._contributions!=0, "Lot of request fail")
+'''