htwkmooc/codeocean
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix tests in models/execution_environment_spec.rb, uncomment @image in lib/docker_client.rb

Browse Source
This commit is contained in:
yqbk
2016-05-25 15:56:49 +02:00
parent 5dc8fb9774
commit 7bc3c4e27c
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/execution_environment.rb
View File

@ -48,6 +48,7 @@ class ExecutionEnvironment < ActiveRecord::Base
def working_docker_image? def working_docker_image?
DockerClient.pull(docker_image) unless DockerClient.image_tags.include?(docker_image) DockerClient.pull(docker_image) unless DockerClient.image_tags.include?(docker_image)
output = DockerClient.new(execution_environment: self).execute_arbitrary_command(VALIDATION_COMMAND) output = DockerClient.new(execution_environment: self).execute_arbitrary_command(VALIDATION_COMMAND)
errors.add(:docker_image, "error: #{output[:stderr]}") if output[:stderr].present? errors.add(:docker_image, "error: #{output[:stderr]}") if output[:stderr].present?
rescue DockerClient::Error => error rescue DockerClient::Error => error
errors.add(:docker_image, "error: #{error}") errors.add(:docker_image, "error: #{error}")

9
lib/docker_client.rb
View File

@ -23,7 +23,7 @@ class DockerClient
def self.clean_container_workspace(container) def self.clean_container_workspace(container)
# remove files when using transferral via Docker API archive_in (transmit) # remove files when using transferral via Docker API archive_in (transmit)
#container.exec(['bash', '-c', 'rm -rf ' + CONTAINER_WORKSPACE_PATH + '/*']) #container.exec(['bash', '-c', 'rm -rf ' + CONTAINER_WORKSPACE_PATH + '/*'])
local_workspace_path = local_workspace_path(container) local_workspace_path = local_workspace_path(container)
if local_workspace_path && Pathname.new(local_workspace_path).exist? if local_workspace_path && Pathname.new(local_workspace_path).exist?
Pathname.new(local_workspace_path).children.each{ |p| p.rmtree} Pathname.new(local_workspace_path).children.each{ |p| p.rmtree}
@ -320,12 +320,11 @@ class DockerClient
Docker::Image.all.map { |image| image.info['RepoTags'] }.flatten.reject { |tag| tag.include?('<none>') } Docker::Image.all.map { |image| image.info['RepoTags'] }.flatten.reject { |tag| tag.include?('<none>') }
end end
# When @image commented test doesn't work
def initialize(options = {}) def initialize(options = {})
@execution_environment = options[:execution_environment] @execution_environment = options[:execution_environment]
# todo: eventually re-enable this if it is cached. But in the end, we do not need this. @image = self.class.find_image_by_tag(@execution_environment.docker_image)
# docker daemon got much too much load. all not 100% necessary calls to the daemon were removed. fail(Error, "Cannot find image #{@execution_environment.docker_image}!") unless @image
#@image = self.class.find_image_by_tag(@execution_environment.docker_image)
#fail(Error, "Cannot find image #{@execution_environment.docker_image}!") unless @image
end end
def self.initialize_environment def self.initialize_environment

2
spec/models/execution_environment_spec.rb
View File

@ -121,7 +121,7 @@ describe ExecutionEnvironment do
describe '#working_docker_image?', docker: true do describe '#working_docker_image?', docker: true do
let(:working_docker_image?) { execution_environment.send(:working_docker_image?) } let(:working_docker_image?) { execution_environment.send(:working_docker_image?) }
before(:each) { expect(DockerClient).to receive(:find_image_by_tag) } before(:each) { expect(DockerClient).to receive(:find_image_by_tag).and_return(Object.new) }
it 'instantiates a Docker client' do it 'instantiates a Docker client' do
expect(DockerClient).to receive(:new).with(execution_environment: execution_environment).and_call_original expect(DockerClient).to receive(:new).with(execution_environment: execution_environment).and_call_original