making tests work with powerhr

rowers/tests/mocks.py

@@ -173,10 +173,6 @@ def mocked_getsmallrowdata_db(*args, **kwargs):
 
     return df
 
-def mocked_read_cols_df_sql(*args, **kwargs):
-    df = pd.read_csv('rowers/tests/testdata/readcols.csv')
-
-    return df,[]
 
 def mocked_getsmallrowdata_db_water(*args, **kwargs):
     df = pd.read_csv('rowers/tests/testdata/colsfromdb.csv')
@@ -204,11 +200,11 @@ def mocked_read_df_cols_sql_multistats(ids,columns,convertnewtons=True):
 
     return df, extracols
 
-def mocked_read_df_cols_sql(ids, columns, convertnewtons=True):
+def mocked_read_cols_df_sql(*args, **kwargs):
-    df = pd.read_csv('rowers/tests/testdata/fake_strokedata.csv')
+    df = pd.read_csv('rowers/tests/testdata/readcols.csv')
-    extracols = []
+
+    return df,[]
 
-    return df, extracols
 
 def mock_workout_summaries(*args, **kwargs):
     df = pd.read_csv('rowers/tests/testdata/workout_summaries.csv')

rowers/views/analysisviews.py

@@ -514,10 +514,10 @@ def statsdata(workouts, options):
         }
 
     fieldlist,fielddict = dataprep.getstatsfields()
-    
     # prepare data frame
     datadf,extracols = dataprep.read_cols_df_sql(ids,fieldlist)
 
+
     datadf = dataprep.clean_df_stats(datadf,workstrokesonly=workstrokesonly)
 
     # Create stats
@@ -525,6 +525,7 @@ def statsdata(workouts, options):
     fielddict.pop('workoutstate')
     fielddict.pop('workoutid')
 
+
     for field,verbosename in fielddict.items():
         thedict = {
             'mean':datadf[field].mean(),

rowsandall_app/settings_dev.py

@@ -11,26 +11,32 @@ https://docs.djangoproject.com/en/1.9/ref/settings/
 """
 from .settings import *
 
-#DATABASES = {
+try:
-#    'default': {
+    use_sqlite = CFG['use_sqlite']
-#        'ENGINE': 'django.db.backends.sqlite3',
+except KeyError:
-#        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    use_sqlite = False
-#        'HOST': 'localhost',
-#    },
-#    'TEST': {
-#	'CHARSET': 'utf8',
-#	'COLLATION': 'utf8_general_ci',
-#	},
 
-#    'slave': {
+if use_sqlite:
-#	'ENGINE': 'django.db.backends.mysql',
+    DATABASES = {
-#	'NAME': 'rowsanda_107501',
+        'default': {
-#	'USER': 'rowsanda_107501',
+            'ENGINE': 'django.db.backends.sqlite3',
-#	'PASSWORD': 'roeidata',
+            'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
-#	'HOST': 'store3.rosti.cz',
+            'HOST': 'localhost',
-#	'PORT': '3306',
+        },
+#        'TEST': {
+#	    'CHARSET': 'utf8',
+#	    'COLLATION': 'utf8_general_ci',
+#        },
+        
+#        'slave': {
+#	    'ENGINE': 'django.db.backends.mysql',
+#            'NAME': 'rowsanda_107501',
+#	    'USER': 'rowsanda_107501',
+#	    'PASSWORD': 'roeidata',
+#	    'HOST': 'store3.rosti.cz',
+#	    'PORT': '3306',
 #	}
-#    }
+    }
 
 BROKER_URL = 'redis://localhost:6379/0'
 CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'