Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
张重言
rails
提交
d7a058f7
R
rails
项目概览
张重言
/
rails
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rails
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d7a058f7
编写于
9月 27, 2014
作者:
M
Matthew Draper
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make AJ integration tests much less verbose
In passing, avoid a blind retry in QC: instead, just fix the problem.
上级
d13b75bc
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
14 addition
and
26 deletion
+14
-26
activejob/test/support/integration/adapters/delayed_job.rb
activejob/test/support/integration/adapters/delayed_job.rb
+1
-1
activejob/test/support/integration/adapters/que.rb
activejob/test/support/integration/adapters/que.rb
+2
-2
activejob/test/support/integration/adapters/queue_classic.rb
activejob/test/support/integration/adapters/queue_classic.rb
+3
-15
activejob/test/support/integration/adapters/resque.rb
activejob/test/support/integration/adapters/resque.rb
+4
-2
activejob/test/support/integration/adapters/sidekiq.rb
activejob/test/support/integration/adapters/sidekiq.rb
+0
-1
activejob/test/support/integration/adapters/sucker_punch.rb
activejob/test/support/integration/adapters/sucker_punch.rb
+1
-0
activejob/test/support/integration/dummy_app_template.rb
activejob/test/support/integration/dummy_app_template.rb
+1
-1
activejob/test/support/integration/helper.rb
activejob/test/support/integration/helper.rb
+2
-4
未找到文件。
activejob/test/support/integration/adapters/delayed_job.rb
浏览文件 @
d7a058f7
...
...
@@ -10,7 +10,7 @@ def clear_jobs
end
def
start_workers
@worker
=
Delayed
::
Worker
.
new
(
quiet:
fals
e
,
sleep_delay:
0.5
,
queues:
%w(integration_tests)
)
@worker
=
Delayed
::
Worker
.
new
(
quiet:
tru
e
,
sleep_delay:
0.5
,
queues:
%w(integration_tests)
)
@thread
=
Thread
.
new
{
@worker
.
start
}
end
...
...
activejob/test/support/integration/adapters/que.rb
浏览文件 @
d7a058f7
...
...
@@ -2,12 +2,12 @@ module QueJobsManager
def
setup
require
'sequel'
ActiveJob
::
Base
.
queue_adapter
=
:que
que_url
=
ENV
[
'QUE_DATABASE_URL'
]
||
'postgres://
localhost
/active_jobs_que_int_test'
que_url
=
ENV
[
'QUE_DATABASE_URL'
]
||
'postgres:///active_jobs_que_int_test'
uri
=
URI
.
parse
(
que_url
)
user
=
uri
.
user
||
ENV
[
'USER'
]
pass
=
uri
.
password
db
=
uri
.
path
[
1
..-
1
]
%x{
#{
"PGPASSWORD=
\"
#{
pass
}
\"
"
if
pass
}
psql -c 'drop database "
#{
db
}
"' -U
#{
user
}
-t template1}
%x{
#{
"PGPASSWORD=
\"
#{
pass
}
\"
"
if
pass
}
psql -c 'drop database
if exists
"
#{
db
}
"' -U
#{
user
}
-t template1}
%x{
#{
"PGPASSWORD=
\"
#{
pass
}
\"
"
if
pass
}
psql -c 'create database "
#{
db
}
"' -U
#{
user
}
-t template1}
Que
.
connection
=
Sequel
.
connect
(
que_url
)
Que
.
migrate!
...
...
activejob/test/support/integration/adapters/queue_classic.rb
浏览文件 @
d7a058f7
module
QueueClassicJobsManager
def
setup
ENV
[
'QC_DATABASE_URL'
]
||=
'postgres://
localhost
/active_jobs_qc_int_test'
ENV
[
'QC_DATABASE_URL'
]
||=
'postgres:///active_jobs_qc_int_test'
ENV
[
'QC_LISTEN_TIME'
]
=
"0.5"
uri
=
URI
.
parse
(
ENV
[
'QC_DATABASE_URL'
])
user
=
uri
.
user
||
ENV
[
'USER'
]
pass
=
uri
.
password
db
=
uri
.
path
[
1
..-
1
]
%x{
#{
"PGPASSWORD=
\"
#{
pass
}
\"
"
if
pass
}
psql -c 'drop database "
#{
db
}
"' -U
#{
user
}
-t template1}
%x{
#{
"PGPASSWORD=
\"
#{
pass
}
\"
"
if
pass
}
psql -c 'drop database
if exists
"
#{
db
}
"' -U
#{
user
}
-t template1}
%x{
#{
"PGPASSWORD=
\"
#{
pass
}
\"
"
if
pass
}
psql -c 'create database "
#{
db
}
"' -U
#{
user
}
-t template1}
ActiveJob
::
Base
.
queue_adapter
=
:queue_classic
QC
::
Setup
.
create
...
...
@@ -17,23 +17,11 @@ def setup
def
clear_jobs
QC
::
Queue
.
new
(
"integration_tests"
).
delete_all
retried
=
false
rescue
=>
e
puts
"Got exception while trying to clear jobs:
#{
e
.
inspect
}
"
if
retried
puts
"Already retried. Raising exception"
raise
e
else
puts
"Retrying"
retried
=
true
QC
::
Conn
.
connection
=
QC
::
Conn
.
connect
retry
end
end
def
start_workers
QC
::
Conn
.
disconnect
@pid
=
fork
do
QC
::
Conn
.
connection
=
QC
::
Conn
.
connect
worker
=
QC
::
Worker
.
new
(
q_name:
'integration_tests'
)
worker
.
start
end
...
...
activejob/test/support/integration/adapters/resque.rb
浏览文件 @
d7a058f7
...
...
@@ -17,13 +17,15 @@ def clear_jobs
def
start_workers
@resque_thread
=
Thread
.
new
do
Resque
::
Worker
.
new
(
"integration_tests"
).
work
(
0.5
)
w
=
Resque
::
Worker
.
new
(
"integration_tests"
)
w
.
term_child
=
true
w
.
work
(
0.5
)
end
@scheduler_thread
=
Thread
.
new
do
Resque
::
Scheduler
.
configure
do
|
c
|
c
.
poll_sleep_amount
=
0.5
c
.
dynamic
=
true
c
.
verbose
=
true
c
.
quiet
=
true
c
.
logfile
=
nil
end
Resque
::
Scheduler
.
master_lock
.
release!
...
...
activejob/test/support/integration/adapters/sidekiq.rb
浏览文件 @
d7a058f7
...
...
@@ -29,7 +29,6 @@ def start_workers
"--concurrency"
,
"1"
,
"--timeout"
,
"1"
,
"--daemon"
,
"--verbose"
])
require
'celluloid'
require
'sidekiq/scheduled'
...
...
activejob/test/support/integration/adapters/sucker_punch.rb
浏览文件 @
d7a058f7
module
SuckerPunchJobsManager
def
setup
ActiveJob
::
Base
.
queue_adapter
=
:sucker_punch
SuckerPunch
.
logger
=
nil
end
end
activejob/test/support/integration/dummy_app_template.rb
浏览文件 @
d7a058f7
if
ENV
[
'AJADAPTER'
]
==
'delayed_job'
generate
"delayed_job:active_record"
generate
"delayed_job:active_record"
,
"--quiet"
rake
(
"db:migrate"
)
end
...
...
activejob/test/support/integration/helper.rb
浏览文件 @
d7a058f7
puts
"
\n\n
"
puts
"*** Running integration tests for
#{
ENV
[
'AJADAPTER'
]
}
***"
puts
"
\n\n
"
puts
"*** rake aj:integration:
#{
ENV
[
'AJADAPTER'
]
}
***
\n
"
ENV
[
"RAILS_ENV"
]
=
"test"
ActiveJob
::
Base
.
queue_name_prefix
=
nil
...
...
@@ -10,7 +8,7 @@
dummy_app_path
=
Dir
.
mktmpdir
+
"/dummy"
dummy_app_template
=
File
.
expand_path
(
"../dummy_app_template.rb"
,
__FILE__
)
args
=
Rails
::
Generators
::
ARGVScrubber
.
new
([
"new"
,
dummy_app_path
,
"--skip-gemfile"
,
"--skip-bundle"
,
"--skip-git"
,
"--skip-spring"
,
"-d"
,
"sqlite3"
,
"--skip-javascript"
,
"--force"
,
"--qui
te
"
,
"--skip-git"
,
"--skip-spring"
,
"-d"
,
"sqlite3"
,
"--skip-javascript"
,
"--force"
,
"--qui
et
"
,
"--template"
,
dummy_app_template
]).
prepare!
Rails
::
Generators
::
AppGenerator
.
start
args
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录