Skip to content

Commit 89f9979

Browse files
authored
Fix functional tests failed (android, push_file) (appium#375)
* Fix: test_push_file * Move remove_fs tests * Move teardown process * Delete selendroid test * tweak * Update along to review comments * Replace double quote with single quote under android dir * Remove creating tmp file * tweak
1 parent 710d1bc commit 89f9979

14 files changed

+84
-143
lines changed

test/functional/android/appium_tests.py

Lines changed: 1 addition & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,8 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
import base64
1716
import unittest
18-
from zipfile import ZipFile
1917
import os
20-
import random
2118
from time import sleep
2219
from dateutil.parser import parse
2320

@@ -42,10 +39,6 @@ def setUp(self):
4239
def tearDown(self):
4340
self.driver.quit()
4441

45-
# remove zipped file from `test_pull_folder`
46-
if hasattr(self, 'zipfilename') and os.path.isfile(self.zipfilename):
47-
os.remove(self.zipfilename)
48-
4942
def test_screen_record(self):
5043
self.driver.start_recording_screen(timeLimit=10, forcedRestart=True)
5144
sleep(10)
@@ -99,35 +92,6 @@ def test_current_package(self):
9992
package = self.driver.current_package
10093
self.assertEqual('com.example.android.apis', package)
10194

102-
def test_push_pull_file(self):
103-
path = '/data/local/tmp/test_push_file.txt'
104-
data = b'This is the contents of the file to push to the device.'
105-
106-
self.driver.push_file(path, base64.b64encode(data).decode('utf-8'))
107-
data_ret = base64.b64decode(self.driver.pull_file(path))
108-
109-
self.assertEqual(data, data_ret)
110-
111-
def test_pull_folder(self):
112-
string_data = b'random string data %d' % random.randint(0, 1000)
113-
path = '/data/local/tmp'
114-
115-
self.driver.push_file(path + '/1.txt', base64.b64encode(string_data).decode('utf-8'))
116-
self.driver.push_file(path + '/2.txt', base64.b64encode(string_data).decode('utf-8'))
117-
118-
folder = self.driver.pull_folder(path)
119-
120-
# python doesn't have any functionality for unzipping streams
121-
# save temporary file, which will be deleted in `tearDown`
122-
self.zipfilename = 'folder_%d.zip' % random.randint(0, 1000000)
123-
with open(self.zipfilename, "wb") as fw:
124-
fw.write(base64.b64decode(folder))
125-
126-
with ZipFile(self.zipfilename, 'r') as myzip:
127-
# should find these. otherwise it will raise a `KeyError`
128-
myzip.read('1.txt')
129-
myzip.read('2.txt')
130-
13195
def test_background_app(self):
13296
self.driver.background_app(1)
13397
sleep(3)
@@ -257,6 +221,6 @@ def test_device_time(self):
257221
parse(date_time)
258222

259223

260-
if __name__ == "__main__":
224+
if __name__ == '__main__':
261225
suite = unittest.TestLoader().loadTestsFromTestCase(AppiumTests)
262226
unittest.TextTestRunner(verbosity=2).run(suite)

test/functional/android/chrome_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ def test_find_single_element(self):
3737
self.assertTrue('I am some other page content' in self.driver.page_source)
3838

3939

40-
if __name__ == "__main__":
40+
if __name__ == '__main__':
4141
suite = unittest.TestLoader().loadTestsFromTestCase(ChromeTests)
4242
unittest.TextTestRunner(verbosity=2).run(suite)

test/functional/android/context_switching_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ def _enter_webview(self):
5656
self.driver.switch_to.context('WEBVIEW')
5757

5858

59-
if __name__ == "__main__":
59+
if __name__ == '__main__':
6060
suite = unittest.TestLoader().loadTestsFromTestCase(ContextSwitchingTests)
6161
unittest.TextTestRunner(verbosity=2).run(suite)

test/functional/android/find_by_accessibility_id_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ def test_element_find_multiple_elements(self):
5151
self.assertIsInstance(sub_els, list)
5252

5353

54-
if __name__ == "__main__":
54+
if __name__ == '__main__':
5555
suite = unittest.TestLoader().loadTestsFromTestCase(FindByAccessibilityIDTests)
5656
unittest.TextTestRunner(verbosity=2).run(suite)

test/functional/android/find_by_image_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,6 @@ def test_find_throws_no_such_element(self):
8383
self.driver.find_element_by_image(image_path)
8484

8585

86-
if __name__ == "__main__":
86+
if __name__ == '__main__':
8787
suite = unittest.TestLoader().loadTestsFromTestCase(FindByImageTests)
8888
unittest.TextTestRunner(verbosity=2).run(suite)

test/functional/android/find_by_uiautomator_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ def test_scroll_into_view(self):
5252
el.click()
5353

5454

55-
if __name__ == "__main__":
55+
if __name__ == '__main__':
5656
suite = unittest.TestLoader().loadTestsFromTestCase(FindByUIAutomatorTests)
5757
unittest.TextTestRunner(verbosity=2).run(suite)

test/functional/android/finger_print_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ def test_finger_print(self):
3232
self.assertEqual(None, result)
3333

3434

35-
if __name__ == "__main__":
35+
if __name__ == '__main__':
3636
suite = unittest.TestLoader().loadTestsFromTestCase(FingerPrintTests)
3737
unittest.TextTestRunner(verbosity=2).run(suite)

test/functional/android/ime_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,6 @@ def test_deactivate_ime_engine(self):
6565
self.assertNotEqual(self.driver.active_ime_engine, engines[-1])
6666

6767

68-
if __name__ == "__main__":
68+
if __name__ == '__main__':
6969
suite = unittest.TestLoader().loadTestsFromTestCase(IMETests)
7070
unittest.TextTestRunner(verbosity=2).run(suite)

test/functional/android/multi_action_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,6 @@ def test_driver_multi_tap(self):
131131
sleep(10)
132132

133133

134-
if __name__ == "__main__":
134+
if __name__ == '__main__':
135135
suite = unittest.TestLoader().loadTestsFromTestCase(MultiActionTests)
136136
unittest.TextTestRunner(verbosity=2).run(suite)

test/functional/android/network_connection_tests.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,6 @@ def test_set_network_connection(self):
4343
self.assertEqual(nc, ConnectionType.DATA_ONLY)
4444

4545

46-
if __name__ == "__main__":
46+
if __name__ == '__main__':
4747
suite = unittest.TestLoader().loadTestsFromTestCase(NetworkConnectionTests)
4848
unittest.TextTestRunner(verbosity=2).run(suite)

0 commit comments

Comments
 (0)