[MediaWiki-commits] [Gerrit] [BrowserTest] Client logins only once to upload all screenshots - change (mediawiki...VisualEditor)

2014-07-29 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged.

Change subject: [BrowserTest] Client logins only once to upload all screenshots
..


[BrowserTest] Client logins only once to upload all screenshots

Change-Id: Ic242d8b2f35ced23809d4454a44f28f260bb3eb7
---
M modules/ve-mw/tests/browser/upload.rb
1 file changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Zfilipin: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/modules/ve-mw/tests/browser/upload.rb 
b/modules/ve-mw/tests/browser/upload.rb
index a4930cc..34dbe4f 100644
--- a/modules/ve-mw/tests/browser/upload.rb
+++ b/modules/ve-mw/tests/browser/upload.rb
@@ -18,23 +18,23 @@
 [[Category:VisualEditor-#{language_code}]]
 end
 
-def upload_image file_path
+def upload_image file_path, client
   language_code = ENV['LANGUAGE_SCREENSHOT_CODE']
   file_name = File.basename(file_path, )
   file_license = license(language_code, file_name)
 
-  require 'mediawiki_api'
-  client = MediawikiApi::Client.new ENV[MEDIAWIKI_API_UPLOAD_URL]
-  client.log_in ENV[MEDIAWIKI_USER], ENV[MEDIAWIKI_PASSWORD]
   client.upload_image(file_name, file_path, file_license, true)
   sleep 5 # Restriction in bot speed: 
https://commons.wikimedia.org/wiki/Commons:Bots#Bot_speed
 end
 
 def upload_images
   screenshot_directory = ENV[LANGUAGE_SCREENSHOT_PATH] || ./screenshots
+  require 'mediawiki_api'
+  client = MediawikiApi::Client.new ENV[MEDIAWIKI_API_UPLOAD_URL]
+  client.log_in ENV[MEDIAWIKI_USER], ENV[MEDIAWIKI_PASSWORD]
   Dir[#{screenshot_directory}/*.png].each do |file_path|
 puts Uploading #{file_path}
-upload_image file_path
+upload_image file_path, client
   end
 end
 

-- 
To view, visit https://gerrit.wikimedia.org/r/148373
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ic242d8b2f35ced23809d4454a44f28f260bb3eb7
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com
Gerrit-Reviewer: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Zfilipin zfili...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] [BrowserTest] Client logins only once to upload all screenshots - change (mediawiki...VisualEditor)

2014-07-22 Thread Vikassy (Code Review) 
Vikassy has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/148373

Change subject: [BrowserTest] Client logins only once to upload all screenshots
..

[BrowserTest] Client logins only once to upload all screenshots

Change-Id: Ic242d8b2f35ced23809d4454a44f28f260bb3eb7
---
M modules/ve-mw/tests/browser/upload.rb
1 file changed, 5 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor 
refs/changes/73/148373/1

diff --git a/modules/ve-mw/tests/browser/upload.rb 
b/modules/ve-mw/tests/browser/upload.rb
index 04b8638..0e97839 100644
--- a/modules/ve-mw/tests/browser/upload.rb
+++ b/modules/ve-mw/tests/browser/upload.rb
@@ -35,24 +35,24 @@
 [[Category:#{language}]]
 end
 
-def upload_image file_path
+def upload_image file_path, client
   language_code = ENV['LANGUAGE_SCREENSHOT_CODE']
   file_name = File.basename(file_path, )
   language = language_string language_code
   file_license = license(language, language_code, file_name)
 
-  require 'mediawiki_api'
-  client = MediawikiApi::Client.new ENV[MEDIAWIKI_API_UPLOAD_URL]
-  client.log_in ENV[MEDIAWIKI_USER], ENV[MEDIAWIKI_PASSWORD]
   client.upload_image(file_name, file_path, file_license, true)
   sleep 5 # Restriction in bot speed: 
https://commons.wikimedia.org/wiki/Commons:Bots#Bot_speed
 end
 
 def upload_images
   screenshot_directory = ENV[LANGUAGE_SCREENSHOT_PATH] || ./screenshots
+  require 'mediawiki_api'
+  client = MediawikiApi::Client.new ENV[MEDIAWIKI_API_UPLOAD_URL]
+  client.log_in ENV[MEDIAWIKI_USER], ENV[MEDIAWIKI_PASSWORD]
   Dir[#{screenshot_directory}/*.png].each do |file_path|
 puts Uploading #{file_path}
-upload_image file_path
+upload_image file_path, client
   end
 end
 

-- 
To view, visit https://gerrit.wikimedia.org/r/148373
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic242d8b2f35ced23809d4454a44f28f260bb3eb7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Vikassy vikasyaligar...@gmail.com

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits