Initial test fixing pass. Four tests still fail.

1 files changed, 99 insertions, 94 deletions

diff --git a/tests/test_filters.py b/tests/test_filters.py
index 7accbd8..3ffa726 100644
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@ -1,109 +1,114 @@
 import pytest
 import time
+import vcr
 
 @pytest.mark.vcr()
 def test_filter_create(api):
-    keyword_filter = api.filter_create("anime", ['notifications'], irreversible = False, whole_word = True, expires_in = None)
-    try:
-        assert(keyword_filter)
-        
-        all_filters = api.filters()
-        assert(keyword_filter in all_filters)
-        assert(keyword_filter.irreversible == False)
-        assert(keyword_filter.whole_word == True)
-        
-        keyword_filter_2 = api.filter(keyword_filter.id)
-        assert(keyword_filter == keyword_filter_2)
-    finally:
-        api.filter_delete(keyword_filter)
-  
-  
-    keyword_filter = api.filter_create("anime", ['notifications'], irreversible = False, whole_word = False, expires_in = None)
-    try:
-        assert(keyword_filter)
-        assert(keyword_filter.irreversible == False)
-        assert(keyword_filter.whole_word == False)
-        
-        all_filters = api.filters()
-        assert(keyword_filter in all_filters)
-        
-        keyword_filter_2 = api.filter(keyword_filter.id)
-        assert(keyword_filter == keyword_filter_2)
-    finally:
-        api.filter_delete(keyword_filter)
-    time.sleep(2)
+    with vcr.use_cassette('test_filter_create.yaml', cassette_library_dir='tests/cassettes_pre_4_0_0', record_mode='none'):
+        keyword_filter = api.filter_create("anime", ['notifications'], irreversible = False, whole_word = True, expires_in = None)
+        try:
+            assert(keyword_filter)
+            
+            all_filters = api.filters()
+            assert(keyword_filter in all_filters)
+            assert(keyword_filter.irreversible == False)
+            assert(keyword_filter.whole_word == True)
+            
+            keyword_filter_2 = api.filter(keyword_filter.id)
+            assert(keyword_filter == keyword_filter_2)
+        finally:
+            api.filter_delete(keyword_filter)
+    
+    
+        keyword_filter = api.filter_create("anime", ['notifications'], irreversible = False, whole_word = False, expires_in = None)
+        try:
+            assert(keyword_filter)
+            assert(keyword_filter.irreversible == False)
+            assert(keyword_filter.whole_word == False)
+            
+            all_filters = api.filters()
+            assert(keyword_filter in all_filters)
+            
+            keyword_filter_2 = api.filter(keyword_filter.id)
+            assert(keyword_filter == keyword_filter_2)
+        finally:
+            api.filter_delete(keyword_filter)
+        time.sleep(2)
     
 @pytest.mark.vcr()
 def test_filter_update(api):
-    keyword_filter = api.filter_create("anime", ['notifications'], irreversible = False, whole_word = True, expires_in = None)
-    keyword_filter_2 = api.filter_update(keyword_filter, phrase = "japanimation")
-    keyword_filter = api.filter(keyword_filter.id)
-    assert(keyword_filter.phrase == "japanimation")
+    with vcr.use_cassette('test_filter_update.yaml', cassette_library_dir='tests/cassettes_pre_4_0_0', record_mode='none'):
+        keyword_filter = api.filter_create("anime", ['notifications'], irreversible = False, whole_word = True, expires_in = None)
+        keyword_filter_2 = api.filter_update(keyword_filter, phrase = "japanimation")
+        keyword_filter = api.filter(keyword_filter.id)
+        assert(keyword_filter.phrase == "japanimation")
 
 @pytest.mark.vcr()
 def test_filter_serverside(api, api2):
-    api.account_follow(api2.account_verify_credentials())
-    keyword_filter_1 = api.filter_create("anime", ['home'], irreversible = True, whole_word = False, expires_in = None)
-    keyword_filter_2 = api.filter_create("girugamesh", ['home'], irreversible = True, whole_word = True, expires_in = None)
-    keyword_filter_3 = api.filter_create("japanimation", ['notifications'], irreversible = True, whole_word = True, expires_in = None)
-    time.sleep(2)
-    status_1 = api2.toot("I love animes")
-    status_2 = api2.toot("Girugamesh!")
-    status_3 = api2.toot("Girugameshnetworking!")
-    status_4 = api2.toot("I love japanimation!")
-    time.sleep(2)
-    tl = api.timeline_home()
-    try:
-        assert not status_1['id'] in map(lambda st: st['id'], tl)
-        assert not status_2['id'] in map(lambda st: st['id'], tl)
-        assert status_3['id'] in map(lambda st: st['id'], tl)
-        assert status_4['id'] in map(lambda st: st['id'], tl)
-    finally:
-        api.filter_delete(keyword_filter_1)
-        api.filter_delete(keyword_filter_2)
-        api.filter_delete(keyword_filter_3)
-        api2.status_delete(status_1)
-        api2.status_delete(status_2)
-        api2.status_delete(status_3)
-        api2.status_delete(status_4)
-    time.sleep(2)
+    with vcr.use_cassette('test_filter_serverside.yaml', cassette_library_dir='tests/cassettes_pre_4_0_0', record_mode='none'):
+        api.account_follow(api2.account_verify_credentials())
+        keyword_filter_1 = api.filter_create("anime", ['home'], irreversible = True, whole_word = False, expires_in = None)
+        keyword_filter_2 = api.filter_create("girugamesh", ['home'], irreversible = True, whole_word = True, expires_in = None)
+        keyword_filter_3 = api.filter_create("japanimation", ['notifications'], irreversible = True, whole_word = True, expires_in = None)
+        time.sleep(2)
+        status_1 = api2.toot("I love animes")
+        status_2 = api2.toot("Girugamesh!")
+        status_3 = api2.toot("Girugameshnetworking!")
+        status_4 = api2.toot("I love japanimation!")
+        time.sleep(2)
+        tl = api.timeline_home()
+        try:
+            assert not status_1['id'] in map(lambda st: st['id'], tl)
+            assert not status_2['id'] in map(lambda st: st['id'], tl)
+            assert status_3['id'] in map(lambda st: st['id'], tl)
+            assert status_4['id'] in map(lambda st: st['id'], tl)
+        finally:
+            api.filter_delete(keyword_filter_1)
+            api.filter_delete(keyword_filter_2)
+            api.filter_delete(keyword_filter_3)
+            api2.status_delete(status_1)
+            api2.status_delete(status_2)
+            api2.status_delete(status_3)
+            api2.status_delete(status_4)
+        time.sleep(2)
         
 @pytest.mark.vcr()
 def test_filter_clientside(api, api2):
-    # Make sure no filters are left over from some previous run
-    # Unclean, but neccesary
-    all_filters = api.filters()
-    for mastodon_filter in all_filters:
-        api.filter_delete(mastodon_filter)
-    
-    time.sleep(2)
-    api.account_follow(api2.account_verify_credentials())
-    keyword_filter_1 = api.filter_create("anime", ['home'], irreversible = False, whole_word = False, expires_in = None)
-    keyword_filter_2 = api.filter_create("girugamesh", ['home'], irreversible = False, whole_word = True, expires_in = None)
-    keyword_filter_3 = api.filter_create("japanimation", ['notifications'], irreversible = False, whole_word = True, expires_in = None)
-    status_1 = api2.toot("I love animes")
-    status_2 = api2.toot("Girugamesh!")
-    status_3 = api2.toot("Girugameshnetworking!")
-    status_4 = api2.toot("I love japanimation!")
-    time.sleep(2)
-    
-    tl = api.timeline_home()
-    try:
-        assert status_1['id'] in map(lambda st: st['id'], tl)
-        assert status_2['id'] in map(lambda st: st['id'], tl)
-        assert status_3['id'] in map(lambda st: st['id'], tl)
-        assert status_4['id'] in map(lambda st: st['id'], tl)
+    with vcr.use_cassette('test_filter_clientside.yaml', cassette_library_dir='tests/cassettes_pre_4_0_0', record_mode='none'):
+        # Make sure no filters are left over from some previous run
+        # Unclean, but neccesary
+        all_filters = api.filters()
+        for mastodon_filter in all_filters:
+            api.filter_delete(mastodon_filter)
+        
+        time.sleep(2)
+        api.account_follow(api2.account_verify_credentials())
+        keyword_filter_1 = api.filter_create("anime", ['home'], irreversible = False, whole_word = False, expires_in = None)
+        keyword_filter_2 = api.filter_create("girugamesh", ['home'], irreversible = False, whole_word = True, expires_in = None)
+        keyword_filter_3 = api.filter_create("japanimation", ['notifications'], irreversible = False, whole_word = True, expires_in = None)
+        status_1 = api2.toot("I love animes")
+        status_2 = api2.toot("Girugamesh!")
+        status_3 = api2.toot("Girugameshnetworking!")
+        status_4 = api2.toot("I love japanimation!")
+        time.sleep(2)
         
-        filtered = api.filters_apply(tl, [keyword_filter_1, keyword_filter_2, keyword_filter_3], 'home')
-        assert not status_1['id'] in map(lambda st: st['id'], filtered)
-        assert not status_2['id'] in map(lambda st: st['id'], filtered)
-        assert status_3['id'] in map(lambda st: st['id'], filtered)
-        assert status_4['id'] in map(lambda st: st['id'], filtered)
-    finally:
-        api.filter_delete(keyword_filter_1)
-        api.filter_delete(keyword_filter_2)
-        api.filter_delete(keyword_filter_3)
-        api2.status_delete(status_1)
-        api2.status_delete(status_2)
-        api2.status_delete(status_3)
-        api2.status_delete(status_4)
+        tl = api.timeline_home()
+        try:
+            assert status_1['id'] in map(lambda st: st['id'], tl)
+            assert status_2['id'] in map(lambda st: st['id'], tl)
+            assert status_3['id'] in map(lambda st: st['id'], tl)
+            assert status_4['id'] in map(lambda st: st['id'], tl)
+            
+            filtered = api.filters_apply(tl, [keyword_filter_1, keyword_filter_2, keyword_filter_3], 'home')
+            assert not status_1['id'] in map(lambda st: st['id'], filtered)
+            assert not status_2['id'] in map(lambda st: st['id'], filtered)
+            assert status_3['id'] in map(lambda st: st['id'], filtered)
+            assert status_4['id'] in map(lambda st: st['id'], filtered)
+        finally:
+            api.filter_delete(keyword_filter_1)
+            api.filter_delete(keyword_filter_2)
+            api.filter_delete(keyword_filter_3)
+            api2.status_delete(status_1)
+            api2.status_delete(status_2)
+            api2.status_delete(status_3)
+            api2.status_delete(status_4)