@@ -43,6 +43,14 @@ def get_cert_files():
4343 client_test_cert_files = generate_cert ()
4444 return client_test_cert_files
4545
46+ def build_test_public_keys_dir (obj ):
47+ obj .nomcom_public_keys_dir = os .path .abspath ("tmp-nomcom-public-keys-dir" )
48+ if not os .path .exists (obj .nomcom_public_keys_dir ):
49+ os .mkdir (obj .nomcom_public_keys_dir )
50+ settings .NOMCOM_PUBLIC_KEYS_DIR = obj .nomcom_public_keys_dir
51+
52+ def clean_test_public_keys_dir (obj ):
53+ shutil .rmtree (obj .nomcom_public_keys_dir )
4654
4755class NomcomViewsTest (TestCase ):
4856 """Tests to create a new nomcom"""
@@ -53,11 +61,7 @@ def check_url_status(self, url, status):
5361 return response
5462
5563 def setUp (self ):
56- self .nomcom_public_keys_dir = os .path .abspath ("tmp-nomcom-public-keys-dir" )
57- if not os .path .exists (self .nomcom_public_keys_dir ):
58- os .mkdir (self .nomcom_public_keys_dir )
59- settings .NOMCOM_PUBLIC_KEYS_DIR = self .nomcom_public_keys_dir
60-
64+ build_test_public_keys_dir (self )
6165 nomcom_test_data ()
6266 self .cert_file , self .privatekey_file = get_cert_files ()
6367 self .year = NOMCOM_YEAR
@@ -81,7 +85,7 @@ def setUp(self):
8185 self .public_nominate_url = reverse ('nomcom_public_nominate' , kwargs = {'year' : self .year })
8286
8387 def tearDown (self ):
84- shutil . rmtree (self . nomcom_public_keys_dir )
88+ clean_test_public_keys_dir (self )
8589
8690 def access_member_url (self , url ):
8791 login_testing_unauthorized (self , COMMUNITY_USER , url )
@@ -753,16 +757,12 @@ class NomineePositionStateSaveTest(TestCase):
753757 """Tests for the NomineePosition save override method"""
754758
755759 def setUp (self ):
756- self .nomcom_public_keys_dir = os .path .abspath ("tmp-nomcom-public-keys-dir" )
757- if not os .path .exists (self .nomcom_public_keys_dir ):
758- os .mkdir (self .nomcom_public_keys_dir )
759- settings .NOMCOM_PUBLIC_KEYS_DIR = self .nomcom_public_keys_dir
760-
760+ build_test_public_keys_dir (self )
761761 nomcom_test_data ()
762762 self .nominee = Nominee .objects .get (email__person__user__username = COMMUNITY_USER )
763763
764764 def tearDown (self ):
765- shutil . rmtree (self . nomcom_public_keys_dir )
765+ clean_test_public_keys_dir (self )
766766
767767 def test_state_autoset (self ):
768768 """Verify state is autoset correctly"""
@@ -792,16 +792,13 @@ def test_nomine_position_unique(self):
792792class FeedbackTest (TestCase ):
793793
794794 def setUp (self ):
795- self .nomcom_public_keys_dir = os .path .abspath ("tmp-nomcom-public-keys-dir" )
796- if not os .path .exists (self .nomcom_public_keys_dir ):
797- os .mkdir (self .nomcom_public_keys_dir )
798- settings .NOMCOM_PUBLIC_KEYS_DIR = self .nomcom_public_keys_dir
795+ build_test_public_keys_dir (self )
799796
800797 nomcom_test_data ()
801798 self .cert_file , self .privatekey_file = get_cert_files ()
802799
803800 def tearDown (self ):
804- shutil . rmtree (self . nomcom_public_keys_dir )
801+ clean_test_public_keys_dir (self )
805802
806803 def test_encrypted_comments (self ):
807804
@@ -828,11 +825,7 @@ def test_encrypted_comments(self):
828825class ReminderTest (TestCase ):
829826
830827 def setUp (self ):
831- self .nomcom_public_keys_dir = os .path .abspath ("tmp-nomcom-public-keys-dir" )
832- if not os .path .exists (self .nomcom_public_keys_dir ):
833- os .mkdir (self .nomcom_public_keys_dir )
834- settings .NOMCOM_PUBLIC_KEYS_DIR = self .nomcom_public_keys_dir
835-
828+ build_test_public_keys_dir (self )
836829 nomcom_test_data ()
837830 self .nomcom = get_nomcom_by_year (NOMCOM_YEAR )
838831 self .cert_file , self .privatekey_file = get_cert_files ()
@@ -872,7 +865,7 @@ def setUp(self):
872865 feedback .nominees .add (n )
873866
874867 def tearDown (self ):
875- shutil . rmtree (self . nomcom_public_keys_dir )
868+ clean_test_public_keys_dir (self )
876869
877870 def test_is_time_to_send (self ):
878871 self .nomcom .reminder_interval = 4
@@ -928,11 +921,15 @@ def test_remind_questionnaire_view(self):
928921class InactiveNomcomTests (TestCase ):
929922
930923 def setUp (self ):
924+ build_test_public_keys_dir (self )
931925 self .nc = NomComFactory .create (** nomcom_kwargs_for_year (group__state_id = 'conclude' ))
932926 self .plain_person = PersonFactory .create ()
933927 self .chair = self .nc .group .role_set .filter (name = 'chair' ).first ().person
934928 self .member = self .nc .group .role_set .filter (name = 'member' ).first ().person
935929
930+ def tearDown (self ):
931+ clean_test_public_keys_dir (self )
932+
936933 def test_feedback_closed (self ):
937934 for view in ['nomcom_public_feedback' , 'nomcom_private_feedback' ]:
938935 url = reverse (view , kwargs = {'year' : self .nc .year ()})
@@ -1118,6 +1115,7 @@ def test_can_view_but_not_edit_templates(self):
11181115class FeedbackLastSeenTests (TestCase ):
11191116
11201117 def setUp (self ):
1118+ build_test_public_keys_dir (self )
11211119 self .nc = NomComFactory .create (** nomcom_kwargs_for_year (group__state_id = 'conclude' ))
11221120 self .author = PersonFactory .create ().email_set .first ().address
11231121 self .member = self .nc .group .role_set .filter (name = 'member' ).first ().person
@@ -1132,6 +1130,9 @@ def setUp(self):
11321130 self .half_hour_ago = now - datetime .timedelta (minutes = 30 )
11331131 self .second_from_now = now + datetime .timedelta (seconds = 1 )
11341132
1133+ def tearDown (self ):
1134+ clean_test_public_keys_dir (self )
1135+
11351136 def test_feedback_index_badges (self ):
11361137 url = reverse ('nomcom_view_feedback' ,kwargs = {'year' :self .nc .year ()})
11371138 login_testing_unauthorized (self , self .member .user .username , url )
@@ -1185,9 +1186,13 @@ def test_feedback_nominee_badges(self):
11851186class NewActiveNomComTests (TestCase ):
11861187
11871188 def setUp (self ):
1189+ build_test_public_keys_dir (self )
11881190 self .nc = NomComFactory .create (** nomcom_kwargs_for_year (group__state_id = 'conclude' ))
11891191 self .chair = self .nc .group .role_set .filter (name = 'chair' ).first ().person
11901192
1193+ def tearDown (self ):
1194+ clean_test_public_keys_dir (self )
1195+
11911196 def test_help (self ):
11921197 url = reverse ('nomcom_chair_help' ,kwargs = {'year' :self .nc .year ()})
11931198 login_testing_unauthorized (self , self .chair .user .username , url )
0 commit comments