From 9117fd408c628f354a6b4f4fa0619e31e205a1ab Mon Sep 17 00:00:00 2001
From: Andrew Melton <andrew.melton@rackspace.com>
Date: Fri, 25 Jan 2013 16:36:07 -0500
Subject: [PATCH] Moving test sys.path/env setup

---
 .coverage                              | Bin 29081 -> 28443 bytes
 tests/unit/__init__.py                 |  22 ++++++++++++++++++++++
 tests/unit/test_datetime_to_decimal.py |   1 -
 tests/unit/utils.py                    |  16 ----------------
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/.coverage b/.coverage
index 57bdd1ebe63d9421b6af0c51c11a505829b43142..9b42c3f9c16d0982b464e58741d43b6f15a912e2 100644
GIT binary patch
delta 1913
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
bDF#lJ_>sHSSq4s%gCm>ObOUF|9QOYgkkOCR

delta 2332
zcmYjTd3;p$5%(>VY&Hj*&7A-V1PBQUBnyFXB!QTN!0-}+31^0|NnVmoHk-`uf?zEm
zC`SYZrdSYAX$u7l1$ng<v=zjjqIlF&TR9X&@kFqqpw+jJhWgKZ=6Af`Z+_onK5zS3
zW!nYi&~BSjCJv8Np0Bed`rWNwm&ZS{dnu<7_sc{D`)GBQ;*8D~du6Dcwk6s66AwVe
zRaYV|@AxQBS5t?%Kb1I5io+MfK;l92O!!1dCmyU{4}VmFA;d#vOXOb2AReZdM17;k
zW-V7z(;}Dq+2amqqjMWwel2)yCUI6KhGH1nFdQQ=68oYZqtSse7>jWjj|rHB$(Vxu
zus^2bU>u4$I1b0-1e}P4ScJtm2`6I-PQgl?hSfL&Yj7ssg|%3Rvv3Z!V+Z<hDXzjE
z+|Yp=aSLw6-FO(E!{hiSp24&DE?&Tk_#R%u_wfU~j344h_%VKhpW<hD1+U>3_$6M)
zukdTUfj9A6HC0guD{8r-s)|~zsI`h(r>F}QwN+8u6?L(qu2j^GiX2-oHbz_0q;&_}
zU0xHk;l$ap%HCtkAs!I~b!IOWLwbR6djq~Mf49~Y{3wXfNaEZeF&4B+O-Q`#Zx2hp
zg-0r8;cx?uu?7<DxCWoVgEBID0^|`p#S>i!qlib#{^(N3Cmti$qUXR^;sU959E5Si
z<HZtF6ET5!VkY*%5aams330kFCQ5-q;v#)j>|DiBOg!n<?R^k}JjtQNL^)Ijlw@);
z08?=w4l<Y-iWz1-*+xYpa3tnp9_Hg1qq>6Id=;5Y-HD}GhUHjcayHdq4RJbF{g68;
z8JOs3#3pP;4O_4k+t7{e!tv!WnYcth8t+ixPU2EIl@Ne3;&Pdi*a#KGQ{+Hm8&ncc
z)svGtEHI52^|dK`6_`$}>iPXoC{RUQEjI`3Qq*4f`}M-#(BSsE0}Ty9<Yy4q7$nK@
z1$lA|Li-2Yotoe6Z8C*BllU&vFD5JnqLe%3#k3@-C9c!Yr;WG3EaKTRAYFqw#B*hJ
zdOge|o-dcuS3*58iD$6izJRzP)0BHq>Pg~srb*P0bFh%urC%A+V}VBECdr$XqHi5`
zT7hO_P5fCc&_diQXR?+<8?jp!4u1;Ti8~}d+Y27zPFa)vDtL*zWPXkdx`|ni<y3%=
z*sq6=XtYSEGeuVCz6^_r@0Qtl^XyBAmuB9gIA}sC$)6}U^CI9L;vY$OZh}70dA9=h
z68~7XkE(%X#LMN%sH&(H#P{{$5Mq4gl!v_`af^H&pXTrKEY^Ic@K+MAk}adJ!u`Y#
z$b<P;VKwm@xo=E|g1sDM^m5STackZ{kb$+t>u#wps68v%w7Oy$WXZR;bon}60rTh{
z;s+&ftPj=`Z;(A>k2oG8e)yK8gB_(W#+qeKQf%^MK_qM>-Xup0YGE_6NX)nv_zCeA
zxp&-2c!c<;GJX8Bu$6e5L`--D9wpu`yC<B09mG4uGjZGhB{S%DxjxO+Yu3kzAMdqG
zh^QgSLA%O<?68EOQPK>XWEhssGvq%Nrw1S7@{X3Rg^|`Lh<6!U+vLoXZVHcawYK`S
zR#!kXpZGK4pUd?^hF=ixHWZ&E_ZOXnJ;cA1+Tt;=mw2CSD1IBBB>t6jP7>Hpd_Z9G
zRQNUVLA_>jtOAFKpOUr`6%G^Y`jL_Z3;c%oX?dfx7Jf_oJIO9{!!yK3WNX=BI7<Ai
zRF$uQ=ZJqVua`6Yf%tiuQn3Jz5g*t0RcufkFA$%&{aCX%Y)Xk$;-n_hDLs{Tc#-&z
zva@mr{E7I_deKw`Y=0sCYq0MP74A%yg=!T1jrb*DwH{6qzbvn*_rNQ}r=+@S8oWyU
zn(VCVhS!PT5J&Y4_&f2NqE$D-KZsB3FIAU>z(0xKlIXf3Db3F{q!%HR3d7-F#Qzqx
zFj2`e@A0IENmrdM?rq{TnMMn$F#7)<HAhkN6;0l$LpV!(PS2aQOo8*n@5tfVE_j#t
zf+Wt-;3DyRvSQ9=xJ3NEB+T6h9}r)b6LZJGhr}Q0-_6amz{kX&NOnEJr^KJh`ucXb
zLj1Yhs9y_LiLdFa$vFE9;{Qlk!#eAi#Mgh&Smc$4DENx_YdP1@3O9&v%Cv<6_=fmf
zd0}A_{FnGU$#S{ma&weya%mAhi*m;u<m+QZ{ie%iiSU6r5n@EKH9r*L3pK~q;CM%K
zl{L&9+T`=*Mr*j4N60*Fl{M1LqvWEt%i7n>?XtdQiFCNbrElvZYm7M;D?P1GTjR_;
zUMkw&vL~2%q7j2+7T*3}XmCf`lgzc`|E)R2p$v=h2NpGUEecxNmtrpW6WzTuw!fJV
zFk-KaLS<uVfxRsd=nn2pHP_SRf%awAfo48P!aGh`)6IOaobTw6-QH-K@5zyMo}Q=-
qbAFf+4f~7387reZ8?2e;Y?f^6Tx}h0=Gl_rU2e@W^AWP&+x0zlP#t{$

diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
index e69de29..4a66dad 100644
--- a/tests/unit/__init__.py
+++ b/tests/unit/__init__.py
@@ -0,0 +1,22 @@
+import os
+import sys
+
+def setup_sys_path():
+    sys.path = [os.path.abspath(os.path.dirname('stacktach'))] + sys.path
+
+
+def setup_environment():
+    '''Other than the settings module, these config settings just need
+        to have values. The are used when the settings module is loaded
+        and then never again.'''
+    os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
+    os.environ['STACKTACH_DB_ENGINE'] = ''
+    os.environ['STACKTACH_DB_NAME'] = ''
+    os.environ['STACKTACH_DB_HOST'] = ''
+    os.environ['STACKTACH_DB_USERNAME'] = ''
+    os.environ['STACKTACH_DB_PASSWORD'] = ''
+    os.environ['STACKTACH_INSTALL_DIR'] = ''
+
+
+setup_sys_path()
+setup_environment()
diff --git a/tests/unit/test_datetime_to_decimal.py b/tests/unit/test_datetime_to_decimal.py
index 1768895..11838ab 100644
--- a/tests/unit/test_datetime_to_decimal.py
+++ b/tests/unit/test_datetime_to_decimal.py
@@ -2,7 +2,6 @@ import datetime
 import decimal
 import unittest
 
-import utils
 from stacktach import datetime_to_decimal
 
 class DatetimeToDecimalTestCase(unittest.TestCase):
diff --git a/tests/unit/utils.py b/tests/unit/utils.py
index e4718b8..ce0493b 100644
--- a/tests/unit/utils.py
+++ b/tests/unit/utils.py
@@ -5,22 +5,6 @@ import unittest
 
 TENANT_ID_1 = 'testtenantid1'
 
-def setup_sys_path():
-    sys.path = [os.path.abspath(os.path.dirname('stacktach'))] + sys.path
-
-def setup_environment():
-    os.environ['DJANGO_SETTINGS_MODULE'] = 'settings'
-    os.environ['STACKTACH_DB_ENGINE'] = 'django.db.backends.sqlite3'
-    when = str(datetime.datetime.utcnow())
-    os.environ['STACKTACH_DB_NAME'] = '/tmp/stacktach.%s.sqlite' % when
-    os.environ['STACKTACH_DB_HOST'] = ''
-    os.environ['STACKTACH_DB_USERNAME'] = ''
-    os.environ['STACKTACH_DB_PASSWORD'] = ''
-    install_dir = os.path.abspath(os.path.dirname('stacktach'))
-    os.environ['STACKTACH_INSTALL_DIR'] = install_dir
-
-setup_sys_path()
-setup_environment()
 from stacktach import datetime_to_decimal as dt
 
 INSTANCE_ID_1 = 'testinstanceid1'