* fix band_spec intermittent test

This commit is contained in:
Seth Call 2015-07-16 13:12:48 -05:00
parent 55c1d2fb41
commit be26beae09
4 changed files with 3 additions and 2 deletions

1
ruby/.gitignore vendored
View File

@ -9,6 +9,7 @@ _yardoc
coverage
doc/
lib/bundler/man
jt_metadata.json
pkg
rdoc
spec/reports

View File

@ -1 +0,0 @@
{"container_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150716-51872-twucnn/jam-track-75.jkz", "version": "0", "coverart": null, "rsa_priv_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150716-51872-twucnn/skey.pem", "tracks": [{"name": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150716-51872-twucnn/a3ecd76f-6176-4595-8bee-ddc9896685fe.ogg", "trackName": "track_00"}], "rsa_pub_file": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/d20150716-51872-twucnn/pkey.pem", "jamktrack_info": "/var/folders/05/1jpzfcln1hq9p666whnd7chr0000gn/T/tmpmYAmj7"}

View File

@ -18,7 +18,7 @@ module JamRuby
raise "blocidispid must be positive" if blocidispid <= 0
raise "score must be positive" if score <= 0
ascore = Score.create(alocidispid: alocidispid, anodeid: anodeid, aaddr: aaddr, auserid: user_info[:auserid], alatencytestid: user_info[:alatencytestid], blocidispid: blocidispid, bnodeid: bnodeid, baddr: baddr, buserid: user_info[:buserid], blatencytestid: user_info[:blatencytestid], score: score, scorer: 0, score_dt: score_dt, scoring_data: score_data)
bscore = Score.create(alocidispid: blocidispid, anodeid: bnodeid, aaddr: baddr, auserid: user_info[:buserid], blatencytestid: user_info[:blatencytestid], blocidispid: alocidispid, bnodeid: anodeid, baddr: aaddr, buserid: user_info[:auserid], blatencytestid: user_info[:alatencytestid], score: score, scorer: 1, score_dt: score_dt) if alocidispid != blocidispid
bscore = Score.create(alocidispid: blocidispid, anodeid: bnodeid, aaddr: baddr, auserid: user_info[:buserid], alatencytestid: user_info[:blatencytestid], blocidispid: alocidispid, bnodeid: anodeid, baddr: aaddr, buserid: user_info[:auserid], blatencytestid: user_info[:alatencytestid], score: score, scorer: 1, score_dt: score_dt) if alocidispid != blocidispid
Score.connection.execute("select update_current_network_scores(#{alocidispid}, #{blocidispid})")
return [ascore, bscore]
end

View File

@ -437,6 +437,7 @@
}
function bindMusicians(musicians, isPending) {
$('#band-profile-members').empty(); // for race conditions seen most often in testing
$.each(musicians, function(index, musician) {
var instrumentLogoHtml = '';
if ("instruments" in musician && musician.instruments != null) {