Skip to content

[GOBBLIN-1780] Refactor/rename YarnServiceIT to YarnServiceTest #3637

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Will-Lo merged 2 commits into from
Feb 7, 2023
Merged

[GOBBLIN-1780] Refactor/rename YarnServiceIT to YarnServiceTest #3637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d4559d
Refactor YarnServiceIT to YarnServiceTest
AndyJiang99 Feb 7, 2023
4309c2b
Refactor additional files
AndyJiang99 Feb 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions .../apache/gobblin/yarn/YarnServiceTest.java → ...rg/apache/gobblin/yarn/YarnServiceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@
* Tests for {@link YarnService}.
*/
@Test(groups = {"gobblin.yarn", "disabledOnCI"}, singleThreaded=true)
public class YarnServiceTest {
final Logger LOG = LoggerFactory.getLogger(YarnServiceTest.class);
public class YarnServiceIT {
final Logger LOG = LoggerFactory.getLogger(YarnServiceIT.class);

private YarnClient yarnClient;
private MiniYARNCluster yarnCluster;
Expand All @@ -88,7 +88,7 @@ public class YarnServiceTest {
private YarnConfiguration clusterConf;
private ApplicationId applicationId;
private ApplicationAttemptId applicationAttemptId;
private final EventBus eventBus = new EventBus("YarnServiceTest");
private final EventBus eventBus = new EventBus("YarnServiceIT");

private final Closer closer = Closer.create();

Expand Down Expand Up @@ -134,8 +134,8 @@ public void setUp() throws Exception {
this.yarnClient.init(this.clusterConf);
this.yarnClient.start();

URL url = YarnServiceTest.class.getClassLoader()
.getResource(YarnServiceTest.class.getSimpleName() + ".conf");
URL url = YarnServiceIT.class.getClassLoader()
.getResource(YarnServiceIT.class.getSimpleName() + ".conf");
Assert.assertNotNull(url, "Could not find resource " + url);

this.config = ConfigFactory.parseURL(url).resolve();
Expand Down
10 changes: 5 additions & 5 deletions gobblin-yarn/src/test/java/org/apache/gobblin/yarn/YarnServiceTestWithExpiration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
*/
@Test(groups = {"gobblin.yarn", "disabledOnCI"})
public class YarnServiceTestWithExpiration {
final Logger LOG = LoggerFactory.getLogger(YarnServiceTest.class);
final Logger LOG = LoggerFactory.getLogger(YarnServiceIT.class);

private YarnClient yarnClient;
private MiniYARNCluster yarnCluster;
Expand All @@ -75,7 +75,7 @@ public class YarnServiceTestWithExpiration {
private YarnConfiguration clusterConf;
private ApplicationId applicationId;
private ApplicationAttemptId applicationAttemptId;
private final EventBus eventBus = new EventBus("YarnServiceTest");
private final EventBus eventBus = new EventBus("YarnServiceIT");

private final Closer closer = Closer.create();

Expand Down Expand Up @@ -122,8 +122,8 @@ public void setUp() throws Exception {
this.yarnClient.init(this.clusterConf);
this.yarnClient.start();

URL url = YarnServiceTest.class.getClassLoader()
.getResource(YarnServiceTest.class.getSimpleName() + ".conf");
URL url = YarnServiceIT.class.getClassLoader()
.getResource(YarnServiceIT.class.getSimpleName() + ".conf");
Assert.assertNotNull(url, "Could not find resource " + url);

this.config = ConfigFactory.parseURL(url).resolve();
Expand Down Expand Up @@ -215,7 +215,7 @@ public boolean apply(Void input) {

}

private static class TestExpiredYarnService extends YarnServiceTest.TestYarnService {
private static class TestExpiredYarnService extends YarnServiceIT.TestYarnService {
public HashSet<ContainerId> startErrorContainers = new HashSet<>();
public HashSet<ContainerStatus> completedContainers = new HashSet<>();
public TestExpiredYarnService(Config config, String applicationName, String applicationId, YarnConfiguration yarnConfiguration,
Expand Down
6 changes: 3 additions & 3 deletions ...n/src/test/resources/YarnServiceTest.conf → ...arn/src/test/resources/YarnServiceIT.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
#

# Yarn/Helix configuration properties
gobblin.cluster.helix.cluster.name=YarnServiceTest
gobblin.cluster.helix.cluster.name=YarnServiceIT
gobblin.cluster.helixInstanceTags=GobblinKafkaStreaming
gobblin.yarn.app.name=YarnServiceTest
gobblin.yarn.work.dir=YarnServiceTest
gobblin.yarn.app.name=YarnServiceIT
gobblin.yarn.work.dir=YarnServiceIT

gobblin.yarn.lib.jars.dir="build/gobblin-yarn/libs"
gobblin.yarn.conf.dir="gobblin-yarn/src/test/resources"
Expand Down