Revert the upload success tracking

Author: pmeenan

internal/process_test.py

@@ -1019,9 +1019,9 @@ def generate_har(self):
 
             if needs_upload and os.path.exists(har_file):
                 if self.job['success'] and 'bq_datastore' in self.job:
-                    self.job['uploaded'] = self.upload_bigquery(har, har_filename, self.job['bq_datastore'])
+                    self.upload_bigquery(har, har_filename, self.job['bq_datastore'])
                 elif 'bq_datastore_failures' in self.job:
-                    self.job['uploaded'] = self.upload_bigquery(har, har_filename, self.job['bq_datastore_failures'])
+                    self.upload_bigquery(har, har_filename, self.job['bq_datastore_failures'])
 
             # Delete the local HAR file if it was only supposed to be uploaded
             if not self.options.har:
@@ -1331,10 +1331,8 @@ def upload_bigquery(self, har, file_name, datastore):
                 self.bigquery_write(write_client, datastore, requests, 'requests')
                 self.bigquery_write(write_client, datastore, parsed_css, 'parsed_css')
                 self.bigquery_write(write_client, datastore, script_chunks, 'script_chunks')
-            return True
         except Exception:
             logging.exception('Error uploading to bigquery')
-            return False
 
     def get_har_page_data(self):
         """Transform the page_data into HAR format"""

internal/webpagetest.py

@@ -1539,26 +1539,26 @@ def upload_test_result(self):
             elif self.options.beanstalk:
                 import greenstalk
                 import zlib
-                if 'beanstalk_completed_queue' in self.job and self.job.get('uploaded'):
+                if 'beanstalk_retry_queue' in self.job and 'success' in self.job and not self.job['success']:
                     try:
-                        logging.debug('Sending test to completed queue: %s', self.job['beanstalk_completed_queue'])
-                        beanstalk = greenstalk.Client((self.options.beanstalk, 11300), encoding=None, use=self.job['beanstalk_completed_queue'])
-                        if 'results' in self.job:
-                            self.raw_job['results'] = self.job['results']
+                        logging.debug('Sending test to retry queue: %s', self.job['beanstalk_retry_queue'])
+                        beanstalk = greenstalk.Client((self.options.beanstalk, 11300), encoding=None, use=self.job['beanstalk_retry_queue'])
                         job_str = json.dumps(self.raw_job)
                         raw = zlib.compress(job_str.encode(), 9)
                         beanstalk.put(raw)
                     except Exception:
-                        logging.exception('Error sending job to completed queue')
-                elif 'beanstalk_retry_queue' in self.job and 'success' in self.job and not self.job['success']:
+                        logging.exception('Error sending job to retry queue')
+                elif 'beanstalk_completed_queue' in self.job and self.job.get('success'):
                     try:
-                        logging.debug('Sending test to retry queue: %s', self.job['beanstalk_retry_queue'])
-                        beanstalk = greenstalk.Client((self.options.beanstalk, 11300), encoding=None, use=self.job['beanstalk_retry_queue'])
+                        logging.debug('Sending test to completed queue: %s', self.job['beanstalk_completed_queue'])
+                        beanstalk = greenstalk.Client((self.options.beanstalk, 11300), encoding=None, use=self.job['beanstalk_completed_queue'])
+                        if 'results' in self.job:
+                            self.raw_job['results'] = self.job['results']
                         job_str = json.dumps(self.raw_job)
                         raw = zlib.compress(job_str.encode(), 9)
                         beanstalk.put(raw)
                     except Exception:
-                        logging.exception('Error sending job to retry queue')
+                        logging.exception('Error sending job to completed queue')
 
         self.raw_job = None
         self.needs_zip = []