Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit def4aae2 authored by Dan Albert's avatar Dan Albert
Browse files

Fix test following -p removal. 

Just use the environment variable.

Test: nose2
Bug: None
Change-Id: I020c737f8aa7416b46794ce387a12f7959a9ca2a
parent 3d33dae7

adb/test_device.py

+7 −1
Original line number Diff line number Diff line
@@ -1144,10 +1144,16 @@ class FileOperationsTest(DeviceTest): 
            temp_files = make_random_host_files(in_dir=full_dir_path, num_files=32)



            # Clean up any trash on the device.

            device = adb.get_device(product=base_dir)

            device = adb.get_device()  # pylint: disable=no-member

            device.shell(['rm', '-rf', self.DEVICE_TEMP_DIR])



            old_product_out = os.environ.get('ANDROID_PRODUCT_OUT')

            os.environ['ANDROID_PRODUCT_OUT'] = base_dir

            device.sync('data')

            if old_product_out is None:

                del os.environ['ANDROID_PRODUCT_OUT']

            else:

                os.environ['ANDROID_PRODUCT_OUT'] = old_product_out



            # Confirm that every file on the device mirrors that on the host.

            for temp_file in temp_files: