geode-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Kirk Lund <kl...@pivotal.io>
Subject Re: Review Request 41750: Modify all tests to use JUnit Categories
Date Mon, 04 Jan 2016 17:12:39 GMT
I forgot to checkout develop and pull it before using the feature finish
cmd.

It's merged in now!

Thanks,
Kirk

On Monday, January 4, 2016, Jens Deppe <jdeppe@pivotal.io> wrote:

> Kirk,
>
> Did your 'origin' remote change at all? Does 'git branch -v -v' tell you
> anything interesting?
>
> --Jens
>
> On Mon, Jan 4, 2016 at 8:33 AM, Kirk Lund <klund@pivotal.io <javascript:;>>
> wrote:
>
> > Right now I'm stuck as git won't let me merge the changes to develop. I'm
> > not sure what to do next and I'm not going to experiment as that usually
> > breaks things worse. I may have to recreate the branch and do this work
> > over.
> >
> > <klund@klund-e6420>/c/dev/gemfire_CLEAN/open [540]$ git flow feature
> > finish
> > -r GEODE-714
> > Branches 'develop' and 'origin/develop' have diverged.
> > Fatal: And branch 'develop' may be fast-forwarded.
> >
> > <klund@klund-e6420>/c/dev/gemfire_CLEAN/open [541]$ git status
> > On branch feature/GEODE-714
> > Your branch is based on 'origin/feature/GEODE-714', but the upstream is
> > gone.
> >   (use "git branch --unset-upstream" to fixup)
> > Untracked files:
> >   (use "git add <file>..." to include in what will be committed)
> >
> >         gemfire-core/stats-01-01.gfs
> >         gemfire-core/stats-02-01.gfs
> >         gemfire-core/stats-03-01.gfs
> >         gemfire-core/stats-04-01.gfs
> >         gemfire-core/stats-05-01.gfs
> >         gemfire-core/stats-06-01.gfs
> >         gemfire-core/stats-07-01.gfs
> >         gemfire-core/stats-08-01.gfs
> >         gemfire-core/stats.gfs
> >
> > nothing added to commit but untracked files present (use "git add" to
> > track)
> >
> >
> > On Tue, Dec 29, 2015 at 4:00 PM, Bruce Schuchardt <
> bschuchardt@pivotal.io <javascript:;>>
> > wrote:
> >
> > > Kirk, I'm in the process of migrading the gemfire-cq project to
> > > open-source.  Are you going to be checking this into the develop branch
> > > soon?
> > >
> > >
> > > Le 12/29/2015 3:41 PM, Kirk Lund a écrit :
> > >
> > >>
> > >> On Dec. 29, 2015, 11:26 p.m., Jens Deppe wrote:
> > >>>
> > >>>> Is it relevant how PerformanceTests are run? I don't see anything
in
> > >>>> build.gradle.
> > >>>>
> > >>> Not currently. But the changes do require that any file matching
> > >> */Test.class must have a category and PerformanceTest already existed.
> > All
> > >> of these tests are microbenchmark "tests" using junit but without any
> > >> assertions. So I marked them each with:
> > >>
> > >> @Category(PerformanceTest.class)
> > >> @Ignore("Tests have no assertions")
> > >>
> > >> If we add a gradle task to run PerformanceTests, then these tests will
> > be
> > >> ignored/skipped (but recorded as such) until someone updates the tests
> > with
> > >> assertions or whatever it takes to make them valid. Right now these
> > tests
> > >> (as written) pass 100% no matter what and we don't have any real tests
> > >> marked with PerformanceTest.
> > >>
> > >> I think the other options are:
> > >>
> > >> 1) Rename these tests to not match */Test.class
> > >> 2) Introduce another unused category (ie not executed by any gradle
> > >> tasks) just as DisabledTest
> > >> 3) Delete these tests (but I hate to do this)
> > >>
> > >>
> > >> - Kirk
> > >>
> > >>
> > >> -----------------------------------------------------------
> > >> This is an automatically generated e-mail. To reply, visit:
> > >> https://reviews.apache.org/r/41750/#review112252
> > >> -----------------------------------------------------------
> > >>
> > >>
> > >> On Dec. 29, 2015, 6:42 p.m., Kirk Lund wrote:
> > >>
> > >>> -----------------------------------------------------------
> > >>> This is an automatically generated e-mail. To reply, visit:
> > >>> https://reviews.apache.org/r/41750/
> > >>> -----------------------------------------------------------
> > >>>
> > >>> (Updated Dec. 29, 2015, 6:42 p.m.)
> > >>>
> > >>>
> > >>> Review request for geode, Anthony Baker, Jens Deppe, William Markito,
> > >>> and Mark Bretl.
> > >>>
> > >>>
> > >>> Bugs: GEODE-714
> > >>>      https://issues.apache.org/jira/browse/GEODE-714
> > >>>
> > >>>
> > >>> Repository: geode
> > >>>
> > >>>
> > >>> Description
> > >>> -------
> > >>>
> > >>> GEODE-714: Modify all tests to use JUnit Categories
> > >>>
> > >>> * Add DistributedTest @Category to DistributedTestCase
> > >>> * Rename disabled tests and use @Ignore instead.
> > >>> * Add PerformanceTest @Category to performance tests.
> > >>> * Disable performance tests that perform no assertions.
> > >>> * Modify build to check all tests for categories.
> > >>> * Modify build to use **/*Test.class pattern for all testing tasks.
> > >>>
> > >>> Note: Use of JUnit or DUnit within the test name is no longer needed.
> > >>>
> > >>> Another note: two of the logging performance tests previously
> contained
> > >>> the word Disabled in the test name on purpose and those were left as
> > is.
> > >>>
> > >>>
> > >>> Diffs
> > >>> -----
> > >>>
> > >>>    build.gradle f464dc3
> > >>>    gemfire-core/src/test/java/com/gemstone/gemfire/BadTest.java
> 46dc799
> > >>>
> > >>>
> >
> gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitDisabledTest.java
> > >>> 4fe8a49
> > >>>
> > >>>
> >
> gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug40255JUnitTest.java
> > >>> PRE-CREATION
> > >>>
> > >>>
> >
> gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitDisabledTest.java
> > >>> 9455641
> > >>>
> > >>>
> >
> gemfire-core/src/test/java/com/gemstone/gemfire/cache30/Bug40662JUnitTest.java
> > >>> PRE-CREATION
> > >>>
> > >>>
> >
> gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/CollaborationJUnitDisabledTest.java
> > >>> 7b93a36
> > >>>
> > >>>
> >
> gemfire-core/src/test/java/com/gemstone/gemfire/distributed/internal/locks/CollaborationJUnitTest.java
> > >>> PRE-CREATION
> > >>>
> > >>>
> >
> gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/diskPerf/DiskRegionPerfJUnitPerformanceTest.java
> > >>> 0ee9d4f
> > >>>
> > >>>
> >
> gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/ha/HARegionQueueStartStopJUnitDisabledTest.java
> > >>> 4cfc9ba
> > >>>
> > >>>
> >
> gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestBaseTest.java
> > >>> 90679d9
> > >>>
> > >>>
> >
> gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart1DUnitTest.java
> > >>> 482fca9
> > >>>
> > >>>
> >
> gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestPart2DUnitTest.java
> > >>> eaa1ca1
> > >>>
> > >>>
> >
> gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/HAInterestTestCase.java
> > >>> PRE-CREATION
> > >>>
> > >>>
> >
> gemfire-core/src/test/java/com/gemstone/gemfire/internal/cache/tier/sockets/command/CommitCommandTest.java
> > >>> b12f55b
> > >>>
> > >>>
> >
> gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/LogWriterPerformanceTest.java
> > >>> 77d7995
> > >>>
> > >>>
> >
> gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/Log4J2DisabledPerformanceTest.java
> > >>> f98868b
> > >>>
> > >>>
> >
> gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/Log4J2PerformanceTest.java
> > >>> a002389
> > >>>
> > >>>
> >
> gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterLoggerDisabledPerformanceTest.java
> > >>> f964208
> > >>>
> > >>>
> >
> gemfire-core/src/test/java/com/gemstone/gemfire/internal/logging/log4j/LogWriterLoggerPerformanceTest.java
> > >>> 61b5131
> > >>>    gemfire-core/src/test/java/dunit/DistributedTestCase.java a3d4785
> > >>>
> > >>>
> >
> gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplJUnitPerformanceTest.java
> > >>> ab2db78
> > >>>
> > >>>
> >
> gemfire-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexRepositoryImplPerformanceTest.java
> > >>> PRE-CREATION
> > >>>
> > >>> Diff: https://reviews.apache.org/r/41750/diff/
> > >>>
> > >>>
> > >>> Testing
> > >>> -------
> > >>>
> > >>> Executed all affected build tasks: checkMissedTests, test,
> > >>> integrationTest, distributedTest, check, assemble, rat
> > >>>
> > >>>
> > >>> Thanks,
> > >>>
> > >>> Kirk Lund
> > >>>
> > >>>
> > >>>
> > >>
> > >
> >
>

Mime
  • Unnamed multipart/alternative (inline, None, 0 bytes)
View raw message