Skip to content

Commit

Permalink
{Netflix#101} More integration tests for JobRestController.
Browse files Browse the repository at this point in the history
  • Loading branch information
amitsharmaak committed Mar 10, 2016
1 parent 296fc89 commit c2bed35
Show file tree
Hide file tree
Showing 7 changed files with 283 additions and 14 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -97,3 +97,7 @@ genie-client/src/main/python/build
genie-client/src/main/python/nflx_genie_client.egg-info
genie-client/src/main/python/MANIFEST
genie-common/src/generated

# Credential Files #
######################################
*credentials.properties
Original file line number Diff line number Diff line change
Expand Up @@ -350,6 +350,7 @@ public void createJobExecution(
jobEntity.setExecution(jobExecutionEntity);
jobEntity.setStatus(JobStatus.RUNNING);
jobEntity.setStatusMsg("Job is Running");
jobEntity.setStarted(new Date());
}

/**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/*
*
* Copyright 2015 Netflix, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.netflix.genie.core.jobs.workflow.impl;

import com.netflix.genie.common.exceptions.GenieException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
/*
*
* Copyright 2015 Netflix, Inc.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
*/
package com.netflix.genie.core.jobs.workflow.impl;

import com.netflix.genie.common.exceptions.GenieException;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import org.springframework.core.io.Resource;
import org.springframework.core.io.ResourceLoader;

import java.io.File;
import java.io.IOException;

/**
Expand All @@ -31,9 +32,9 @@ public class JobConfigIntegrationTest {
public Resource jobsDir(
final ResourceLoader resourceLoader
) throws IOException {
//final String currentDir = new File("/tmp").getAbsolutePath();
//final Resource jobsDirResource = resourceLoader.getResource(currentDir + "/build/tmp/");
final Resource jobsDirResource = resourceLoader.getResource("file:///tmp/");
final String currentDir = new File(".").getCanonicalPath();
final Resource jobsDirResource = resourceLoader.getResource(currentDir + "/build/tmp/genie/");
//final Resource jobsDirResource = resourceLoader.getResource("file:///tmp/");
return jobsDirResource;
}
}
Loading

0 comments on commit c2bed35

Please sign in to comment.